procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix tr1/8_c_compatibility/cstdio/functions.cc regression with recent glibc

Browse source 
The following testcase started FAILing recently after the
https://sourceware.org/git/?p=glibc.git;a=commit;h=64b1a44183a3094672ed304532bedb9acc707554
glibc change which marked vfscanf with nonnull (1) attribute.
While vfwscanf hasn't been marked similarly (strangely), the patch changes
that too.  By using va_arg one hides the value of it from the compiler
(volatile keyword would do too, or making the FILE* stream a function
argument, but then it might need to be guarded by #if or something).

2023-10-13  Jakub Jelinek  <jakub@redhat.com>

	* testsuite/tr1/8_c_compatibility/cstdio/functions.cc (test01):
	Initialize stream to va_arg(ap, FILE*) rather than 0.
	* testsuite/tr1/8_c_compatibility/cwchar/functions.cc (test01):
	Likewise.
This commit is contained in:
Jakub Jelinek 2023-10-13 09:09:32 +02:00
parent 6decda1a35
commit badb798f5e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc
View file

@ -35,7 +35,7 @@ void test01(int dummy, ...)
char* s = 0;
const char* cs = 0;
const char* format = "%i";
FILE* stream = 0;
FILE* stream = va_arg(ap, FILE*);
std::size_t n = 0;
int ret;

2
libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc
View file

@ -42,7 +42,7 @@ void test01(int dummy, ...)
#endif
#if _GLIBCXX_HAVE_VFWSCANF
FILE* stream = 0;
FILE* stream = va_arg(arg, FILE*);
const wchar_t* format1 = 0;
int ret1;
ret1 = std::tr1::vfwscanf(stream, format1, arg);