ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-31 16:35:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix SIGSEGV and off-by-one error in logDebug

Browse Source 
We must use separate va_start/va_end pairs for each call to vsnprintf
on Linux and possibly other platforms in order to avoid a crash.
Also, we need to give it room to null terminate the string at the
right point.
This commit is contained in:
Joel Dice 2013-02-06 11:40:06 -07:00
parent ef11cd1d8d
commit 5241660463
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/machine.cpp
View File

@ -4769,11 +4769,14 @@ logTrace(FILE* f, const char* fmt, ...)
#else #else
const unsigned length = vsnprintf(0, 0, fmt, a); const unsigned length = vsnprintf(0, 0, fmt, a);
#endif #endif
RUNTIME_ARRAY(char, buffer, length + 1);
vsnprintf(&buffer[0], length, fmt, a);
buffer[length] = 0;
va_end(a); va_end(a);
RUNTIME_ARRAY(char, buffer, length + 1);
va_start(a, fmt);
vsnprintf(&buffer[0], length + 1, fmt, a);
va_end(a);
buffer[length] = 0;
::fprintf(f, "%s", &buffer[0]); ::fprintf(f, "%s", &buffer[0]);
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
::OutputDebugStringA(&buffer[0]); ::OutputDebugStringA(&buffer[0]);