* stdio-common/Makefile (tests): Add bug20.

* stdio-common/bug20.c: New file.
This commit is contained in:
Ulrich Drepper 2007-10-28 16:45:27 +00:00
parent 4c6b2202cb
commit 22c915ac42
3 changed files with 35 additions and 1 deletions

View File

@ -3,6 +3,8 @@
[BZ #5225] [BZ #5225]
* stdio-common/vfscanf.c (_IO_vfwscanf): Don't misuse wp pointer * stdio-common/vfscanf.c (_IO_vfwscanf): Don't misuse wp pointer
to keep track of end of %[ format string element. to keep track of end of %[ format string element.
* stdio-common/Makefile (tests): Add bug20.
* stdio-common/bug20.c: New file.
[BZ #5222] [BZ #5222]
* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short * elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short

View File

@ -57,7 +57,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \ tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \ tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \ tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20
test-srcs = tst-unbputc tst-printf test-srcs = tst-unbputc tst-printf

32
stdio-common/bug20.c Normal file
View File

@ -0,0 +1,32 @@
/* BZ #5225 */
#include <stdio.h>
#include <string.h>
#include <wchar.h>
static int
do_test (void)
{
wchar_t in[] = L"123,abc,321";
/* This is the critical part for this test. format must be in
read-only memory. */
static const wchar_t format[50] = L"%d,%[^,],%d";
int out_d1, out_d2;
char out_s[50];
printf ("in='%ls' format='%ls'\n", in, format);
if (swscanf (in, format, &out_d1, out_s, &out_d2) != 3)
{
puts ("swscanf did not return 3");
return 1;
}
printf ("in='%ls' format='%ls'\n", in, format);
printf ("out_d1=%d out_s='%s' out_d2=%d\n", out_d1, out_s, out_d2);
if (out_d1 != 123 || strcmp (out_s, "abc") != 0 || out_d2 != 321)
{
puts ("swscanf did not return the correct values");
return 1;
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"