From 332983c97b7a729c4dc5f19aa9ee4a22c420f7d8 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:23:44 +1000 Subject: The Formatting String Catastrophe --- source/core/StarSignalHandler_windows.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/core/StarSignalHandler_windows.cpp') diff --git a/source/core/StarSignalHandler_windows.cpp b/source/core/StarSignalHandler_windows.cpp index 0445aba..29e93c5 100644 --- a/source/core/StarSignalHandler_windows.cpp +++ b/source/core/StarSignalHandler_windows.cpp @@ -59,19 +59,19 @@ struct SignalHandlerImpl { else if (modeFlag == 8) mode = "Execute"; else - mode = strf("Mode(%s)", modeFlag); - g_sehMessage = strf("Access violation detected at %s (%s of address %s)", + mode = strf("Mode({})", modeFlag); + g_sehMessage = strf("Access violation detected at {} ({} of address {})", ExceptionInfo->ExceptionRecord->ExceptionAddress, mode, (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); } else { g_sehMessage = msg; - g_sehMessage = strf("%s (%p @ %s)", + g_sehMessage = strf("{} (%p @ {})", g_sehMessage, ExceptionInfo->ExceptionRecord->ExceptionCode, ExceptionInfo->ExceptionRecord->ExceptionAddress); for (DWORD i = 0; i < ExceptionInfo->ExceptionRecord->NumberParameters; i++) - g_sehMessage = strf("%s [%s]", g_sehMessage, (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[i]); + g_sehMessage = strf("{} [{}]", g_sehMessage, (PVOID)ExceptionInfo->ExceptionRecord->ExceptionInformation[i]); } // setup a hijack into our own trampoline as if the failure actually was a -- cgit v1.2.3