1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00

tests: replace fread by xfread

With fortification enabled, fread calls return result needs to be checked,
has it gets the __wur macro enabled.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Frederic Berat
2023-06-12 17:18:20 +02:00
committed by Siddhesh Poyarekar
parent 127c21c0e2
commit a84dcb4bdf
9 changed files with 65 additions and 12 deletions

View File

@@ -1,6 +1,8 @@
#include <stdio.h>
#include <string.h>
#include <support/xstdio.h>
char x[4096], z[4096], b[21], m[4096 * 4];
int
@@ -20,24 +22,24 @@ main (void)
}
rewind (f);
fread (m, 4096 * 4 - 10, 1, f);
fread (b, 20, 1, f);
xfread (m, 4096 * 4 - 10, 1, f);
xfread (b, 20, 1, f);
printf ("got %s (should be %s)\n", b, "zzzzzzzzzzxxxxxxxxxx");
if (strcmp (b, "zzzzzzzzzzxxxxxxxxxx"))
failed = 1;
fseek (f, -40, SEEK_CUR);
fread (b, 20, 1, f);
xfread (b, 20, 1, f);
printf ("got %s (should be %s)\n", b, "zzzzzzzzzzzzzzzzzzzz");
if (strcmp (b, "zzzzzzzzzzzzzzzzzzzz"))
failed = 1;
fread (b, 20, 1, f);
xfread (b, 20, 1, f);
printf ("got %s (should be %s)\n", b, "zzzzzzzzzzxxxxxxxxxx");
if (strcmp (b, "zzzzzzzzzzxxxxxxxxxx"))
failed = 1;
fread (b, 20, 1, f);
xfread (b, 20, 1, f);
printf ("got %s (should be %s)\n", b, "xxxxxxxxxxxxxxxxxxxx");
if (strcmp (b, "xxxxxxxxxxxxxxxxxxxx"))
failed = 1;

View File

@@ -1,6 +1,8 @@
#include <stdio.h>
#include <string.h>
#include <support/xstdio.h>
int
main (void)
{
@@ -32,7 +34,7 @@ main (void)
char buf[25];
buf[0] = j;
fread (buf + 1, 1, 23, f);
xfread (buf + 1, 1, 23, f);
buf[24] = '\0';
if (strcmp (buf, "Where does this text go?") != 0)
{

View File

@@ -2,6 +2,8 @@
#include <unistd.h>
#include <string.h>
#include <support/xstdio.h>
int stdio_block_read = 1, stdio_block_write = 1;
int
@@ -30,7 +32,7 @@ main (int argc, char *argv[])
fseek (f, 8180L, 0);
fwrite ("Where does this text come from?", 1, 31, f);
fseek (f, 8180L, 0);
fread (buffer, 1, 31, f);
xfread (buffer, 1, 31, f);
fwrite (buffer, 1, 31, stdout);
fclose (f);
remove (filename);

View File

@@ -5,6 +5,8 @@
#include <stdio.h>
#include <support/xstdio.h>
#define THE_COOKIE ((void *) 0xdeadbeeful)
@@ -77,7 +79,8 @@ do_test (void)
f = fopencookie (THE_COOKIE, "r+", fcts);
fread (buf, 1, 1, f);
xfread (buf, 1, 1, f);
fwrite (buf, 1, 1, f);
fseek (f, 0, SEEK_CUR);
fclose (f);

View File

@@ -21,6 +21,8 @@
#include <string.h>
#include <sys/types.h>
#include <support/xstdio.h>
static void
print_buffer (const char *s, size_t n)
{
@@ -153,7 +155,7 @@ do_test_read_seek_neg (const char *mode, const char *expected)
FILE *fp = fmemopen (buf, sizeof (buf), mode);
fseek (fp, offset, SEEK_END);
fread (tmp, tmps, 1, fp);
xfread (tmp, tmps, 1, fp);
if (memcmp (tmp, expected, tmps) != 0)
{