Changeset 1017 for trunk/dll/arccnrs.c

Timestamp:

May 26, 2008, 5:02:59 AM (17 years ago)

Author:

Gregg Young

Message:

fortify updates for threads dble free fix

File:

• trunk/dll/arccnrs.c (modified) (4 diffs)

trunk/dll/arccnrs.c

@@ -1739 +1739 @@
                   p++;
                 }
-                p =
-                  xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
-                          pszSrcFile, __LINE__);
+                p = xmalloc(strlen(temp) + strlen(li->targetpath) + 2,
+                            pszSrcFile, __LINE__);
                 if (p) {
                   strcpy(p, li->targetpath);
@@ -1996 +1995 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
       xfree(dcd, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
@@ -3440 +3442 @@
         idinc = 0;
       WinSetWindowUShort(hwndFrame, QWS_ID, id);
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
       dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
       if (!dcd) {
@@ -3523 +3528 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          xfree(dcd, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
           hwndFrame = (HWND) 0;
         }