dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Window crash log: Reduce sensitivity of stack infinite loop detection

Browse Source 
Only trigger if 8 previous frames are the same, not only 1
This commit is contained in:
Jonathan G Rennison
2023-11-29 18:28:15 +00:00
parent a38c2a19a1
commit b10a22218f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/windows/crashlog_win.cpp
View File

@@ -401,6 +401,8 @@ static const uint MAX_FRAMES = 64;
sym_info->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64); sym_info->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
sym_info->MaxNameLength = MAX_SYMBOL_LEN; sym_info->MaxNameLength = MAX_SYMBOL_LEN;
std::array<DWORD64, 8> last_offsets = {};
/* Walk stack at most MAX_FRAMES deep in case the stack is corrupt. */ /* Walk stack at most MAX_FRAMES deep in case the stack is corrupt. */
for (uint num = 0; num < MAX_FRAMES; num++) { for (uint num = 0; num < MAX_FRAMES; num++) {
auto guard = scope_guard([&]() { auto guard = scope_guard([&]() {
@@ -414,11 +416,13 @@ static const uint MAX_FRAMES = 64;
#endif #endif
hCur, GetCurrentThread(), &frame, &ctx, nullptr, proc.pSymFunctionTableAccess64, proc.pSymGetModuleBase64, nullptr)) break; hCur, GetCurrentThread(), &frame, &ctx, nullptr, proc.pSymFunctionTableAccess64, proc.pSymGetModuleBase64, nullptr)) break;
if (frame.AddrPC.Offset == frame.AddrReturn.Offset) { if (std::find_if(last_offsets.begin(), last_offsets.end(), [&](DWORD64 offset) { return offset != frame.AddrPC.Offset; }) == last_offsets.end()) {
buffer += seprintf(buffer, last, " <infinite loop>\n"); buffer += seprintf(buffer, last, " <infinite loop>\n");
break; break;
} }
last_offsets[num % last_offsets.size()] = frame.AddrPC.Offset;
/* Get module name. */ /* Get module name. */
const char *mod_name = "???"; const char *mod_name = "???";
const char *image_name = nullptr; const char *image_name = nullptr;