Changed wording of OpenSSH vs bad OpenSSL FAQ so that it's more obvious it

[sgt/putty] / misc.c

diff --git a/misc.c b/misc.c
index cb894b3..6f2d544 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -294,7 +294,7 @@ static void *minefield_alloc(int size)
     /*
      * Update the admin region.
      */
-    for (i = start + 2; i < start + npages - 1; i++)
+    for (i = start + 2; i < start + npages + 1; i++)
        minefield_admin[i] = 0xFFFE;   /* used but no region starts here */
     minefield_admin[start + 1] = region_start % PAGESIZE;
 
@@ -408,12 +408,14 @@ void *safemalloc(size_t size)
 #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)
@@ -443,12 +445,14 @@ void *saferealloc(void *ptr, size_t size)
 #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)