Changeset 1032 for trunk/dll/comp.c

Timestamp:

Jun 30, 2008, 4:55:36 AM (17 years ago)

Author:

Gregg Young

Message:

Fortify updates including a leave scope wrapper which frees and in some cases reloads commands, archivers, association, etc.

File:

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

trunk/dll/comp.c

@@ -203 +203 @@
       hmq2 = WinCreateMsgQueue(hab2, 0);
       if (hmq2) {
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
         WinCancelShutdown(hmq2, TRUE);
         IncrThreadUsage();
@@ -312 +315 @@
       }
       WinTerminate(hab2);
+# ifdef FORTIFY
+      xFortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
     }
   }
@@ -404 +410 @@
     hmq = WinCreateMsgQueue(hab, 0);
     if (hmq) {
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       WinCancelShutdown(hmq, TRUE);
       IncrThreadUsage();
@@ -682 +691 @@
     // PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);        // 18 Jan 08 SHL we can count now
     DecrThreadUsage();
+    xfree(cmp, pszSrcFile, __LINE__);
     WinTerminate(hab);
+# ifdef FORTIFY
+    xFortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
   }
-  xfree(cmp, pszSrcFile, __LINE__);
+  else
+    xfree(cmp, pszSrcFile, __LINE__);
 }
 
@@ -708 +722 @@
     hmq = WinCreateMsgQueue(hab, 0);
     if (hmq) {
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       WinCancelShutdown(hmq, TRUE);
       IncrThreadUsage();
@@ -739 +756 @@
     }
     DecrThreadUsage();
+    xfree(cmp, pszSrcFile, __LINE__);
     WinTerminate(hab);
+# ifdef FORTIFY
+    xFortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
   }
-  xfree(cmp, pszSrcFile, __LINE__);
+  else
+    xfree(cmp, pszSrcFile, __LINE__);
 }
 
@@ -1932 +1954 @@
           } // if on both sides
 
-          if (x <= 0)
+          if (x <= 0) {
+# ifdef FORTIFY
+            xfree(filesl[l++], pszSrcFile, __LINE__);
+# else
             free(filesl[l++]);          // Done with item on left
-
-          if (x >= 0)
-            free(filesr[r++]);          // Done with item on right
-
+# endif
+          }
+          if (x >= 0) {
+# ifdef FORTIFY
+            xfree(filesr[r++], pszSrcFile, __LINE__);
+# else
+            free(filesr[r++]);          // Done with item on right
+#endif
+          }
           // Ensure empty buffers point somewhere
           if (!pcil->pszFileName) {
@@ -1956 +1986 @@
 
           if (!pcil->pszSubject)
-            pcil->pszSubject = NullStr;
           if (!pcir->pszSubject)
             pcir->pszSubject = NullStr;
@@ -1987 +2016 @@
           }
           if (filesl) {
-            for(; filesl[l]; l++)
-              free(filesl[l]);
+            for(; filesl[l]; l++) {
+# ifdef FORTIFY
+              xfree(filesl[l], pszSrcFile, __LINE__);
+# else
+              free(filesl[l]);
+# endif
+            }
           }
           if (pcir) {
@@ -1998 +2032 @@
           }
           if (filesr) {
-            for (; filesr[r]; r++)
-              free(filesr[r]);
+            for (; filesr[r]; r++) {
+# ifdef FORTIFY
+              xfree(filesr[r], pszSrcFile, __LINE__);
+# else
+              free(filesr[r]);
+# endif
+            }
           }
           // Reduce count to match what is in containers
@@ -2078 +2117 @@
 
 # ifdef FORTIFY
-  // 10 May 08 SHL fixme to suppress W111
-  Fortify_LeaveScope();
+  xFortify_LeaveScope(pszSrcFile, __LINE__);
 # endif