ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed varargs modification. 

Ref.: #541.
master
madmaxoft 2014-01-15 17:46:14 +01:00
parent 0571b1a7e6
commit 3fd19df9fd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/StringUtils.cpp
View File

@ -28,6 +28,10 @@ AString & AppendVPrintf(AString & str, const char *format, va_list args)
// MS CRT provides secure printf that doesn't behave like in the C99 standard // MS CRT provides secure printf that doesn't behave like in the C99 standard
if ((len = _vsnprintf_s(buffer, ARRAYCOUNT(buffer), _TRUNCATE, format, args)) != -1) if ((len = _vsnprintf_s(buffer, ARRAYCOUNT(buffer), _TRUNCATE, format, args)) != -1)
#else // _MSC_VER #else // _MSC_VER
// We need to store a copy of the args, because on AMD64 in GCC the vsnprintf() is allowed to make changes to it (WTF?)
// Ref.: issue #541, http://www.bailopan.net/blog/?p=30
va_list args2;
va_copy(args2, args);
if ((len = vsnprintf(buffer, ARRAYCOUNT(buffer), format, args)) < ARRAYCOUNT(buffer)) if ((len = vsnprintf(buffer, ARRAYCOUNT(buffer), format, args)) < ARRAYCOUNT(buffer))
#endif // else _MSC_VER #endif // else _MSC_VER
{ {
@ -51,7 +55,7 @@ AString & AppendVPrintf(AString & str, const char *format, va_list args)
#ifdef _MSC_VER #ifdef _MSC_VER
vsprintf_s((char *)&(Buffer.front()), Buffer.size(), format, args); vsprintf_s((char *)&(Buffer.front()), Buffer.size(), format, args);
#else // _MSC_VER #else // _MSC_VER
vsnprintf((char *)&(Buffer.front()), Buffer.size(), format, args); vsnprintf((char *)&(Buffer.front()), Buffer.size(), format, args2);
#endif // else _MSC_VER #endif // else _MSC_VER
str.append(&(Buffer.front()), Buffer.size() - 1); str.append(&(Buffer.front()), Buffer.size() - 1);
return str; return str;