Changeset 1016 for trunk/dll/dircnrs.c

Timestamp:

May 12, 2008, 3:19:05 AM (17 years ago)

Author:

Steven Levine

Message:

Add stale dcd sanity checks

File:

• trunk/dll/dircnrs.c (modified) (12 diffs)

trunk/dll/dircnrs.c

@@ -36 +36 @@
   15 Feb 08 SHL Sync with settings menu rework
   22 Feb 08 JBS Ticket 230: Fix/improve various code related to state or presparam values in the INI file.
+  11 May 08 GKY Avoid using stale dcd after free
+  11 May 08 SHL Add stale dcd sanity checks
 
 ***********************************************************************/
@@ -59 +61 @@
 #include "strutil.h"                    // GetPString
 #include "notebook.h"                   // CfgDlgProc
-#include "command.h"                    // RunCommand
+#include "command.h"                    // RunCommand
 #include "fm3dll.h"
 #include "fortify.h"
@@ -602 +604 @@
       cni.pRecord = NULL;
       cni.pDragInfo = (PDRAGINFO) mp1;
-      // DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
       li =
         DoFileDrop(dcd->hwndCnr, dcd->directory, FALSE, MPVOID,
@@ -1497 +1498 @@
       }
        SayFilter(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                                DIR_FILTER), &dcd->mask, FALSE);
+                                DIR_FILTER), &dcd->mask, FALSE);
        SaySort(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                              DIR_SORT), dcd->sortFlags, FALSE);
+                              DIR_SORT), dcd->sortFlags, FALSE);
        SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                              DIR_VIEW), dcd->flWindowAttr);
+                              DIR_VIEW), dcd->flWindowAttr);
     }
     else {
@@ -1513 +1514 @@
       AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
       SayFilter(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                DIR_FILTER), &dcd->mask, FALSE);
+                DIR_FILTER), &dcd->mask, FALSE);
       SaySort(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-              DIR_SORT), dcd->sortFlags, FALSE);
+              DIR_SORT), dcd->sortFlags, FALSE);
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-              DIR_VIEW), dcd->flWindowAttr);
+              DIR_VIEW), dcd->flWindowAttr);
     } else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -1528 +1529 @@
 
       if (hwndMenu == DirCnrMenu ||
-          hwndMenu == FileMenu || hwndMenu == DirMenu) {
+          hwndMenu == FileMenu ||
+          hwndMenu == DirMenu) {
         MarkAll(hwnd, TRUE, FALSE, TRUE);
         if (dcd->cnremphasized) {
@@ -2077 +2079 @@
                                     DIR_FILTER), &dcd->mask, FALSE);
         }
-        break;
+        break;
 
       case IDM_UNHIDEALL:
-        WinSendMsg(hwnd, CM_FILTER, MPFROMP(Filter), MPFROMP(&dcd->mask));
-        break;
+        WinSendMsg(hwnd, CM_FILTER, MPFROMP(Filter), MPFROMP(&dcd->mask));
+        break;
 
       case IDM_HIDEALL:
@@ -2886 +2888 @@
           ULONG action = UM_ACTION;
 
-          // DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
           li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
           CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
@@ -3321 +3322 @@
     if (dcd) {
       dcd->stopflag++;
-      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
       if (!dcd->dontclose && ParentIsDesktop(dcd->hwndFrame, (HWND) 0))
-        PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
+        PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
       if (dcd->hwndObject) {
-          WinSetWindowPtr(dcd->hwndObject, QWL_USER, NULL);
-          PostMsg(dcd->hwndObject, WM_CLOSE, MPVOID, MPVOID);
+          // Ensure object window destroy does not attempt duplicate clean up
+          WinSetWindowPtr(dcd->hwndObject, QWL_USER, NULL);
+          if (!PostMsg(dcd->hwndObject, WM_CLOSE, MPVOID, MPVOID))
+            Win_Error(dcd->hwndObject, hwnd, pszSrcFile, __LINE__, "hwndObject WinPostMsg failed");
       }
       if (dcd->hwndRestore)
-        WinSetWindowPos(dcd->hwndRestore,
-                        HWND_TOP,
-                        0,
-                        0,
-                        0,
-                        0,
-                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
-      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
+        WinSetWindowPos(dcd->hwndRestore,
+                        HWND_TOP,
+                        0,
+                        0,
+                        0,
+                        0,
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
       xfree(dcd, pszSrcFile, __LINE__);
       WinSetWindowPtr(hwnd, QWL_USER, NULL);
-      //printf("%i %x %x %x\n", dcd->dontclose, dcd->hwndFrame, dcd->hwndObject, dcd);
       //Fortify_LeaveScope();
       DosPostEventSem(CompactSem);
@@ -3358 +3358 @@
     EmptyCnr(hwnd);
     break;
-  }
-  if (dcd && dcd->oldproc){
+  } // switch
+
+  if (dcd && dcd->oldproc) {
+      // 11 May 08 SHL fixme debug fortify
+      if ((ULONG)dcd->oldproc == 0xa9a9a9a9)
+        DbgMsg(pszSrcFile, __LINE__, "calling oldproc after dcd free msg %x mp1 %x mp2 %x", msg, mp1, mp2);
       return dcd->oldproc(hwnd, msg, mp1, mp2);
   }
@@ -3424 +3428 @@
       dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
       if (!dcd) {
-        PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
+        PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
         hwndFrame = (HWND) 0;
       }
@@ -3472 +3476 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          xfree(dcd, pszSrcFile, __LINE__);
           hwndFrame = (HWND) 0;
         }
         else {
-          RestorePresParams(dcd->hwndCnr, "DirCnr");
+          RestorePresParams(dcd->hwndCnr, "DirCnr");
           WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);
           dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,
-                                           (PFNWP) DirCnrWndProc);
+                                           (PFNWP) DirCnrWndProc);
           {
             USHORT ids[] = { DIR_TOTALS, DIR_SELECTED, DIR_VIEW, DIR_SORT,