Changeset 1513

Timestamp:

Apr 13, 2010, 10:38:41 PM (16 years ago)

Author:

Steven Levine

Message:

Avoid referencing buffer after freeing dcd

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• collect.c (modified) (1 diff)
• dircnrs.c (modified) (1 diff)
• treecnr.c (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -2223 +2223 @@
       FreeList(dcd->lastselection);
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
+      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
       free(dcd);
 #     ifdef FORTIFY
       Fortify_LeaveScope();
 #     endif
-      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
     if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))

trunk/dll/collect.c

@@ -1072 +1072 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
       FreeList(dcd->lastselection);
+      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
       free(dcd);
 #     ifdef FORTIFY
       Fortify_LeaveScope();
 #     endif
-      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
     DosPostEventSem(CompactSem);

trunk/dll/dircnrs.c

@@ -1195 +1195 @@
                         SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
+      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
       xfree(dcd, pszSrcFile, __LINE__);
-      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
       DosPostEventSem(CompactSem);
     }

trunk/dll/treecnr.c

@@ -998 +998 @@
       WinSendMsg(dcd->hwndCnr,
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
+      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
       free(dcd);
 #     ifdef FORTIFY
       Fortify_LeaveScope();
 #     endif
-      WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);
     }
     DosPostEventSem(CompactSem);