Merge pull request ninja-build#2394 from jheydebrand/GetLastErrorStri…

…ng-crash Fix crash when FormatMessageA sets lpBuffer to nullptr
pkitszel · Mar 16, 2024 · 86997c4 · 86997c4
2 parents 3b23631 + df4c6a4
commit 86997c4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/util.cc b/src/util.cc
@@ -540,6 +540,13 @@ string GetLastErrorString() {
         (char*)&msg_buf,
         0,
         NULL);
+
+  if (msg_buf == nullptr) {
+    char fallback_msg[128] = {0};
+    snprintf(fallback_msg, sizeof(fallback_msg), "GetLastError() = %d", err);
+    return fallback_msg;
+  }
+
   string msg = msg_buf;
   LocalFree(msg_buf);
   return msg;