Ensure our network layer is properly cleaned up before PuTTY exits.

[u/mdw/putty] / misc.c

diff --git a/misc.c b/misc.c
index 3073115..ee1abf7 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -379,8 +379,13 @@ static void *minefield_c_realloc(void *p, size_t size)
 #ifdef MALLOC_LOG
 static FILE *fp = NULL;
 
+static char *mlog_file = NULL;
+static int mlog_line = 0;
+
 void mlog(char *file, int line)
 {
+    mlog_file = file;
+    mlog_line = line;
     if (!fp) {
        fp = fopen("putty_mem.log", "w");
        setvbuf(fp, NULL, _IONBF, BUFSIZ);
@@ -399,9 +404,18 @@ void *safemalloc(size_t size)
     p = malloc(size);
 #endif
     if (!p) {
-       MessageBox(NULL, "Out of memory!", "PuTTY Fatal Error",
+       char str[200];
+#ifdef MALLOC_LOG
+       sprintf(str, "Out of memory! (%s:%d, size=%d)",
+               mlog_file, mlog_line, size);
+       fprintf(fp, "*** %s\n", str);
+       fclose(fp);
+#else
+       strcpy(str, "Out of memory!");
+#endif
+       MessageBox(NULL, str, "PuTTY Fatal Error",
                   MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
-       exit(1);
+       cleanup_exit(1);
     }
 #ifdef MALLOC_LOG
     if (fp)
@@ -427,9 +441,18 @@ void *saferealloc(void *ptr, size_t size)
 #endif
     }
     if (!p) {
-       MessageBox(NULL, "Out of memory!", "PuTTY Fatal Error",
+       char str[200];
+#ifdef MALLOC_LOG
+       sprintf(str, "Out of memory! (%s:%d, size=%d)",
+               mlog_file, mlog_line, size);
+       fprintf(fp, "*** %s\n", str);
+       fclose(fp);
+#else
+       strcpy(str, "Out of memory!");
+#endif
+       MessageBox(NULL, str, "PuTTY Fatal Error",
                   MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
-       exit(1);
+       cleanup_exit(1);
     }
 #ifdef MALLOC_LOG
     if (fp)