Changeset 1034 for trunk/dll/newview.c

Timestamp:

Jun 30, 2008, 4:17:03 PM (17 years ago)

Author:

Gregg Young

Message:

More fortify changes

File:

• trunk/dll/newview.c (modified) (5 diffs)

trunk/dll/newview.c

@@ -1373 +1373 @@
       WinCancelShutdown(hmq2, TRUE);
       IncrThreadUsage();
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       if (ad) {
@@ -1382 +1385 @@
             xfree(ad->lines, pszSrcFile, __LINE__);
             xfree(ad->markedlines, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
             ad->text = NULL;
             ad->lines = NULL;
@@ -1434 +1434 @@
                               GetPString(IDS_ERRORREADINGTEXT), ad->filename);
                     xfree(ad->text, pszSrcFile, __LINE__);
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-# endif
                     ad->text = NULL;
                     ad->textsize = 0;
@@ -1471 +1468 @@
     DecrThreadUsage();
     WinTerminate(hab2);
+# ifdef FORTIFY
+    xFortify_LeaveScope(pszSrcFile, __LINE__);
+# endif
   }
   if (error)
@@ -3969 +3969 @@
         xfree(ad, pszSrcFile, __LINE__);
 # ifdef FORTIFY
-  Fortify_LeaveScope();
+      xFortify_LeaveScope(pszSrcFile, __LINE__);
 # endif
       }