mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: [Win32] Truncated stack trace symbols were not null-terminated 

SymGetSymFromAddr64/IMAGEHLP_SYMBOL64 do not null-terminate
symbols with lengths >= the name buffer size
pull/13015/head
Jonathan G Rennison 2024-10-19 12:29:21 +01:00 committed by rubidium42
parent 18e8a34081
commit d7a2efd623
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/os/windows/crashlog_win.cpp
View File

@ -235,9 +235,12 @@ static const uint MAX_FRAMES = 64;
CONTEXT ctx;
memcpy(&ctx, ep->ContextRecord, sizeof(ctx));
/* Allocate space for symbol info. */
char sym_info_raw[sizeof(IMAGEHLP_SYMBOL64) + MAX_SYMBOL_LEN - 1];
IMAGEHLP_SYMBOL64 *sym_info = (IMAGEHLP_SYMBOL64*)sym_info_raw;
/* Allocate space for symbol info.
* The total initialised size must be sufficient for a null-terminating char at sym_info->Name[sym_info->MaxNameLength],
* SymGetSymFromAddr64 is not required to write a null-terminating char.
* sizeof(IMAGEHLP_SYMBOL64) includes at least one char of the Name buffer. */
std::array<char, sizeof(IMAGEHLP_SYMBOL64) + MAX_SYMBOL_LEN> sym_info_raw{};
IMAGEHLP_SYMBOL64 *sym_info = reinterpret_cast<IMAGEHLP_SYMBOL64*>(sym_info_raw.data());
sym_info->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
sym_info->MaxNameLength = MAX_SYMBOL_LEN;