Changeset 1011

Timestamp:

May 11, 2008, 5:00:39 AM (17 years ago)

Author:

Gregg Young

Message:

Fortify updates to get it working everywhere

Location:

trunk

Files:

• dll/arccnrs.c (modified) (1 diff)
• dll/dircnrs.c (modified) (1 diff)
• dll/draglist.c (modified) (1 diff)
• dll/fm3dll.def (modified) (1 diff)
• dll/grep.c (modified) (1 diff)
• dll/icons/dunno.ico (modified) ( previous)
• dll/icons/removabl.ico (modified) ( previous)
• dll/mainwnd.c (modified) (1 diff)
• dll/ufortify.h (modified) (2 diffs)
• dll/wrappers.c (modified) (5 diffs)
• eas.c (modified) (3 diffs)

trunk/dll/arccnrs.c

@@ -83 +83 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)

trunk/dll/dircnrs.c

@@ -3321 +3321 @@
       dcd->stopflag++;
       if (!dcd->dontclose && ParentIsDesktop(dcd->hwndFrame, (HWND) 0))
-        PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
+        PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
       if (!dcd->hwndObject ||
           !PostMsg(dcd->hwndObject, WM_CLOSE, MPVOID, MPVOID)) {

trunk/dll/draglist.c

@@ -36 +36 @@
 #include "errutil.h"                    // Dos_Error...
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;

trunk/dll/fm3dll.def

@@ -286 +286 @@
          RunFM2Util_                                  .268,
          xDosFindFirst_                               .269,
-         xDosFindNext_                                .270
-
+         xDosFindNext_                                .270,
+         xfree_                                       .271,
+         xmalloc_                                     .272
+

trunk/dll/grep.c

@@ -51 +51 @@
 #include "tmrsvcs.h"                    // ITIMER_DESC
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA2)

trunk/dll/mainwnd.c

@@ -182 +182 @@
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), TRUE);
       fNoTileUpdate = FALSE;
-      xfree((char *)mp1, pszSrcFile, __LINE__);
+      //xfree((char *)mp1, pszSrcFile, __LINE__);
       if (fAutoTile)
         TileChildren(hwndMain, TRUE);

trunk/dll/ufortify.h

@@ -17 +17 @@
 #define FORTIFY_BEFORE_SIZE      32  /* Bytes to allocate before block */
 #define FORTIFY_BEFORE_VALUE   0xA3  /* Fill value before block        */
-                      
+
 #define FORTIFY_AFTER_SIZE       32  /* Bytes to allocate after block  */
 #define FORTIFY_AFTER_VALUE    0xA5  /* Fill value after block         */
@@ -47 +47 @@
 
 /* #define FORTIFY_NO_PERCENT_P */       /* sprintf() doesn't support %p */
-/* #define FORTIFY_STRDUP       */       /* if you use non-ANSI strdup() */
+#define FORTIFY_STRDUP              /* if you use non-ANSI strdup() */
 
 // #include "_malloc.h"

trunk/dll/wrappers.c

@@ -332 +332 @@
 # ifdef FORTIFY
     Fortify_free(pv, pszSrcFile, uiLineNumber);
-# else  
+# else
     free(pv);
 # endif
@@ -345 +345 @@
 # ifdef FORTIFY
   PVOID pv = Fortify_malloc(cBytes, pszSrcFile, uiLineNumber);
-# else  
+# else
   PVOID pv = malloc(cBytes);
 # endif
@@ -359 +359 @@
 PVOID xmallocz(size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber)
 {
-  PVOID pv = malloc(cBytes);
-
-  if (!pv)
-    Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
-  else
+  PVOID pv = xmalloc(cBytes, pszSrcFile, uiLineNumber);
+
+  if (pv)
     memset(pv, 0, cBytes);
 
@@ -374 +372 @@
 {
   if (pvIn != NullStr) {
-    PVOID pv = realloc(pvIn, cBytes);
+# ifdef FORTIFY
+  PVOID pv = Fortify_realloc(pvIn, cBytes, pszSrcFile, uiLineNumber);
+# else
+  PVOID pv = realloc(pvIn, cBytes);
+# endif
 
     if (!pv && cBytes)
@@ -391 +393 @@
 # ifdef FORTIFY
   PSZ psz = Fortify_strdup(pszIn, pszSrcFile, uiLineNumber);
-# else  
+# else
   PSZ psz = strdup(pszIn);
 # endif

trunk/eas.c

@@ -27 +27 @@
 #include "dll\fm3dll.h"
 
+static PSZ pszSrcFile = __FILE__;
+
 int main (int argc,char *argv[])
 {
@@ -52 +54 @@
         if (!list) {
           strcpy(fullname, "*");
-          list = malloc(sizeof(CHAR *) * 2);
+          list = xmalloc(sizeof(CHAR *) * 2, pszSrcFile, __LINE__);
           if (list &&
               insert_filename(HWND_DESKTOP,fullname,TRUE,FALSE) &&
               *fullname && *fullname != '*') {
-            list[0] = fullname;
-            list[1] = NULL;
+           list[0] = fullname;
+           list[1] = NULL;
           }
         }
@@ -74 +76 @@
   }
   if (list)
-    free(list);
+    xfree(list, pszSrcFile, __LINE__);
   return 0;
 }