Fix memory access violation on fatal error with Windows

dlaugt · dlaugt · commit f67eab6c4974 · 2024-03-08T16:15:40.000+01:00
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -2753,26 +2753,29 @@ fatal_output_debug(const char *msg)
 
     OutputDebugStringW(L"Fatal Python error: ");
 
-    msglen = strlen(msg);
-    while (msglen) {
-        size_t i;
+    if (msg) {
+        msglen = strlen(msg);
+        while (msglen) {
+            size_t i;
 
-        if (buflen > msglen) {
-            buflen = msglen;
-        }
+            if (buflen > msglen) {
+                buflen = msglen;
+            }
 
-        /* Convert the message to wchar_t. This uses a simple one-to-one
-           conversion, assuming that the this error message actually uses
-           ASCII only. If this ceases to be true, we will have to convert. */
-        for (i=0; i < buflen; ++i) {
-            buffer[i] = msg[i];
-        }
-        buffer[i] = L'\0';
-        OutputDebugStringW(buffer);
+            /* Convert the message to wchar_t. This uses a simple one-to-one
+               conversion, assuming that the this error message actually uses
+               ASCII only. If this ceases to be true, we will have to convert. */
+            for (i=0; i < buflen; ++i) {
+                buffer[i] = msg[i];
+            }
+            buffer[i] = L'\0';
+            OutputDebugStringW(buffer);
 
-        msg += buflen;
-        msglen -= buflen;
+            msg += buflen;
+            msglen -= buflen;
+        }
     }
+
     OutputDebugStringW(L"\n");
 }
 #endif
