Changeset 1009 for trunk/dll/comp.c

Timestamp:

May 10, 2008, 9:51:58 AM (17 years ago)

Author:

Steven Levine

Message:

Add xfree xstrdup Fortify support
Add MT capable Fortify scope logic

File:

• trunk/dll/comp.c (modified) (25 diffs)

trunk/dll/comp.c

@@ -81 +81 @@
 #include "notebook.h"                   // External compare/dircompare
 
+#include "fortify.h"                    // 06 May 08 SHL
+
 typedef struct
 {
@@ -144 +146 @@
         DosFindClose(hdir);
       }
-      xfree(mask);
+      xfree(mask, pszSrcFile, __LINE__);
     }
-    xfree(pffb);
+    xfree(pffb, pszSrcFile, __LINE__);
   }
 }
@@ -178 +180 @@
       }
     }
-    xfree(sf);
+    xfree(sf, pszSrcFile, __LINE__);
   }
 }
@@ -485 +487 @@
                 pciD->flags = 0;        // Just on one side
                 if (pciD->pszSubject != NullStr) {
-                  xfree(pciD->pszSubject);
+                  xfree(pciD->pszSubject, pszSrcFile, __LINE__);
                   pciD->pszSubject = NullStr;
                 }
@@ -533 +535 @@
               pciD->pszLongName = pciS->pszLongName;
               if (pciD->pszSubject != NullStr) {
-                xfree(pciD->pszSubject);
+                xfree(pciD->pszSubject, pszSrcFile, __LINE__);
                 pciD->pszSubject = NullStr;
               }
@@ -549 +551 @@
 
               if (pciS->pszFileName != NullStr) {
-                xfree(pciS->pszFileName);
+                xfree(pciS->pszFileName, pszSrcFile, __LINE__);
                 pciS->pszFileName = NullStr;
                 pciS->pszDisplayName = pciS->pszFileName;
@@ -555 +557 @@
               }
               if (pciS->pszSubject != NullStr) {
-                xfree(pciS->pszSubject);
+                xfree(pciS->pszSubject, pszSrcFile, __LINE__);
                 pciS->pszSubject = NullStr;
               }
@@ -650 +652 @@
               // Forget status until we regenerate it
               if (pciS->pszSubject != NullStr) {
-                xfree(pciS->pszSubject);
+                xfree(pciS->pszSubject, pszSrcFile, __LINE__);
                 pciS->pszSubject = NullStr;
               }
@@ -682 +684 @@
     WinTerminate(hab);
   }
-  xfree(cmp);
+  xfree(cmp, pszSrcFile, __LINE__);
 }
 
@@ -739 +741 @@
     WinTerminate(hab);
   }
-  xfree(cmp);
+  xfree(cmp, pszSrcFile, __LINE__);
 }
 
@@ -784 +786 @@
   pciSa = xmalloc(sizeof(PCNRITEM) * numS, pszSrcFile, __LINE__);
   if (!pciSa) {
-    xfree(pciDa);
+    xfree(pciDa, pszSrcFile, __LINE__);
     return;
   }
@@ -817 +819 @@
       goto Restart;
     }
-    xfree(pciDa);
-    xfree(pciSa);
+    xfree(pciDa, pszSrcFile, __LINE__);
+    xfree(pciSa, pszSrcFile, __LINE__);
     Runtime_Error(pszSrcFile, __LINE__, "numD %u != x %lu", numD, x);
     return;
@@ -844 +846 @@
       goto Restart;
     }
-    xfree(pciSa);
-    xfree(pciDa);
+    xfree(pciSa, pszSrcFile, __LINE__);
+    xfree(pciDa, pszSrcFile, __LINE__);
     Runtime_Error(pszSrcFile, __LINE__, "numS (%lu) != x (%lu)", numS, x);
     return;
@@ -1288 +1290 @@
   }
 
-  xfree(pciSa);
-  xfree(pciDa);
+  xfree(pciSa, pszSrcFile, __LINE__);
+  xfree(pciDa, pszSrcFile, __LINE__);
 
   if (fUpdateHideButton) {
@@ -1330 +1332 @@
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
   if (!pffbArray) {
-    xfree(maskstr);
+    xfree(maskstr, pszSrcFile, __LINE__);
     return;
   }
@@ -1378 +1380 @@
             // Complain if pathnames exceeds max
             DosFindClose(hDir);
-            xfree(pffbArray);
-            xfree(maskstr);
+            xfree(pffbArray, pszSrcFile, __LINE__);
+            xfree(maskstr, pszSrcFile, __LINE__);
             if (!fDone) {
               fDone = TRUE;
@@ -1412 +1414 @@
   }
 
-  xfree(maskstr);
-  xfree(pffbArray);
+  xfree(maskstr, pszSrcFile, __LINE__);
+  xfree(pffbArray, pszSrcFile, __LINE__);
 
   // DbgMsg(pszSrcFile, __LINE__, "FillDirList finish %s", str);
@@ -1444 +1446 @@
   CNRINFO cnri;
 
+# ifdef FORTIFY
+  // 10 May 08 SHL fixme to suppress W111
+  Fortify_EnterScope();
+# endif
+
   if (!cmp) {
     Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+# ifdef FORTIFY
+    // 10 May 08 SHL fixme to suppress W111
+    Fortify_LeaveScope();
+# endif
     _endthread();
   }
@@ -1994 +2005 @@
         } // if insufficient resources
 
-          xfree(filesl);                        // Free header - have already freed elements
+          xfree(filesl, pszSrcFile, __LINE__);                  // Free header - have already freed elements
         filesl = NULL;
-          xfree(filesr);
+          xfree(filesr, pszSrcFile, __LINE__);
         filesr = NULL;
 
@@ -2063 +2074 @@
     WinTerminate(hab);
   }
-  xfree(cmp);
+  xfree(cmp, pszSrcFile, __LINE__);
   DosPostEventSem(CompactSem);
+
+# ifdef FORTIFY
+  // 10 May 08 SHL fixme to suppress W111
+  Fortify_LeaveScope();
+# endif
 
   // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread exit");
@@ -2624 +2640 @@
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
           WinDismissDlg(hwnd, 0);
-          xfree(forthread);
+          xfree(forthread, pszSrcFile, __LINE__);
         }
         else {
@@ -2904 +2920 @@
               Runtime_Error(pszSrcFile, __LINE__,
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
-              xfree(sf);
+              xfree(sf, pszSrcFile, __LINE__);
             }
           }
@@ -2956 +2972 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(forthread);
+            xfree(forthread, pszSrcFile, __LINE__);
           }
           else {
@@ -3079 +3095 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(forthread);
+            xfree(forthread, pszSrcFile, __LINE__);
           }
           else {
@@ -3235 +3251 @@
           WinSendMsg(cmp->dcd.hwndObject, WM_CLOSE, MPVOID, MPVOID);
       }
-      xfree(cmp);
+      xfree(cmp, pszSrcFile, __LINE__);
     }
     EmptyCnr(hwndLeft);