Changeset 1078 for trunk/dll/objwin.c

Timestamp:

Jul 19, 2008, 6:08:02 AM (17 years ago)

Author:

Steven Levine

Message:

More Fortify infrastructure enhancements
Rework Fortify_SetOwner
Add Fortify_BecomeOwner
Avoid more spurious leak reports

File:

• trunk/dll/objwin.c (modified) (2 diffs)

trunk/dll/objwin.c

@@ -25 +25 @@
 #include "arccnrs.h"                    // ArcObjWndProc
 #include "errutil.h"                    // Win_Error
+#include "fortify.h"
+#ifdef FORTIFY
+#include "misc.h"                       // GetTidForThread
+#endif
 #include "fm3dll.h"
-#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -96 +99 @@
           for (i = 0; WinIsWindow(hab2, hwndCnr) && i < 10; i++)
             DosSleep(50);
-          Fortify_LeaveScope();
+          for (;;) {
+            UCHAR scope = Fortify_LeaveScope();
+            if ((CHAR)scope == 0)
+              break;
+            Runtime_Error(pszSrcFile, __LINE__, "Attempting to exit thread %u with scope non-zero (%u)",
+                          GetTidForThread(), scope);
+            if ((CHAR)scope < 0)
+              break;
+          }
         }
 #       endif