Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent segfault in vararg test with MinGW

Browse Source 
The segmentation fault is caused by swscanf with __USE_MINGW_ANSI_STDIO=1.
See https://sourceforge.net/p/mingw-w64/mailman/message/36118530/
This commit is contained in:
Maarten Bent
2018-07-31 00:17:54 +02:00
parent 33ea26c8b6
commit f3ae302b4d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/strings/vararg.cpp
View File

@@ -200,7 +200,6 @@ void VarArgTestCase::Sscanf()
{ {
int i = 0; int i = 0;
char str[20]; char str[20];
wchar_t wstr[20];
wxString input("42 test"); wxString input("42 test");
@@ -208,10 +207,18 @@ void VarArgTestCase::Sscanf()
CPPUNIT_ASSERT( i == 42 ); CPPUNIT_ASSERT( i == 42 );
CPPUNIT_ASSERT( wxString(str) == "test" ); CPPUNIT_ASSERT( wxString(str) == "test" );
#if !(defined(__MINGW32__) && \
defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO == 1)
// disable this test on mingw with __USE_MINGW_ANSI_STDIO=1
// to prevent a segmentation fault. See:
// https://sourceforge.net/p/mingw-w64/mailman/message/36118530/
wchar_t wstr[20];
i = 0; i = 0;
wxSscanf(input, L"%d %s", &i, &wstr); wxSscanf(input, L"%d %s", &i, &wstr);
CPPUNIT_ASSERT( i == 42 ); CPPUNIT_ASSERT( i == 42 );
CPPUNIT_ASSERT( wxString(wstr) == "test" ); CPPUNIT_ASSERT( wxString(wstr) == "test" );
#endif
} }
void VarArgTestCase::RepeatedPrintf() void VarArgTestCase::RepeatedPrintf()