FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-01-28 17:52:13 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixes crash with large strings through LogManager

Browse Source 
va_list types have an edge where after operating on it, then it is undefined behaviour to do anything other than va_end on the object.
So in order to call vsnprintf on it multiple times we must create copies with va_copy.
Easy enough to work around by doing a few more copies of the va_list
This commit is contained in:
Ryan Houdek 2021-03-10 16:30:37 -08:00
parent e708b83dbb
commit 4e55f29589
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
External/FEXCore/Source/Utils/LogManager.cpp vendored
View File

@ -12,12 +12,18 @@ void UnInstallHandlers() { Handlers.clear(); }
[[noreturn]] void M(const char *fmt, va_list args) {
size_t MsgSize = 1024;
char *Buffer = reinterpret_cast<char*>(alloca(MsgSize));
size_t Return = vsnprintf(Buffer, MsgSize, fmt, args);
va_list argsCopy;
va_copy(argsCopy, args);
size_t Return = vsnprintf(Buffer, MsgSize, fmt, argsCopy);
va_end(argsCopy);
if (Return >= MsgSize) {
// Allocate a bigger size on failure
MsgSize = Return;
Buffer = reinterpret_cast<char*>(alloca(MsgSize));
vsnprintf(Buffer, MsgSize, fmt, args);
va_end(argsCopy);
va_copy(argsCopy, args);
vsnprintf(Buffer, MsgSize, fmt, argsCopy);
va_end(argsCopy);
}
for (auto &Handler : Handlers) {
@ -36,12 +42,18 @@ void UnInstallHandlers() { Handlers.clear(); }
void M(DebugLevels Level, const char *fmt, va_list args) {
size_t MsgSize = 1024;
char *Buffer = reinterpret_cast<char*>(alloca(MsgSize));
size_t Return = vsnprintf(Buffer, MsgSize, fmt, args);
va_list argsCopy;
va_copy(argsCopy, args);
size_t Return = vsnprintf(Buffer, MsgSize, fmt, argsCopy);
va_end(argsCopy);
if (Return >= MsgSize) {
// Allocate a bigger size on failure
MsgSize = Return;
Buffer = reinterpret_cast<char*>(alloca(MsgSize));
vsnprintf(Buffer, MsgSize, fmt, args);
va_end(argsCopy);
va_copy(argsCopy, args);
vsnprintf(Buffer, MsgSize, fmt, argsCopy);
va_end(argsCopy);
}
for (auto &Handler : Handlers) {
Handler(Level, Buffer);