Changeset 1836 for trunk/dll/dircnrs.c

Timestamp:

Jul 15, 2015, 2:48:14 AM (10 years ago)

Author:

Gregg Young

Message:

Fix trap in collector if a pci-pszFileName = NullStr and fix heap corruption problem and its related traps. This code reverts John double free fix. Ticket [551][555]

File:

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

trunk/dll/dircnrs.c

@@ -97 +97 @@
 #include <ctype.h>
 #include <limits.h>
+//#include <malloc.h>                   // _msize _heapchk
 // #include <process.h>                 // _beginthread
 
@@ -169 +170 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "copyf.h"                      // ignorereadonly
+#if 0
+#define  __PMPRINTF__
+#include "PMPRINTF.H"
+#endif
 
 // Data definitions
@@ -791 +796 @@
       }
       else
-        *szFree = 0;
+        *szFree = 0;
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       commafmt(tf, sizeof(tf), dcd->totalfiles);
       CommaFmtULL(tb, sizeof(tb), dcd->ullTotalBytes, ' ');
+      DosReleaseMutexSem(hmtxFiltering);
       if (!fMoreButtons) {
         sprintf(s, " [%s / %s]%s%s%s%s %s",
@@ -873 +880 @@
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       AdjustCnrColsForFSType(dcd->hwndCnr, dcd->directory, &dcd->ds, FALSE);
-      dcd->ullTotalBytes = dcd->totalfiles =
-        dcd->selectedfiles = dcd->selectedbytes = 0;
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+      dcd->ullTotalBytes = dcd->totalfiles = dcd->selectedfiles = dcd->selectedbytes = 0;
+      DosReleaseMutexSem(hmtxFiltering);
       WinSetDlgItemText(dcd->hwndClient, DIR_TOTALS, "0 / 0k");
       WinSetDlgItemText(dcd->hwndClient, DIR_SELECTED, "0 / 0k");
@@ -1220 +1228 @@
       DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       xfree(dcd, pszSrcFile, __LINE__);
+      dcd = NULL;
       DosReleaseMutexSem(hmtxFiltering);
       DosPostEventSem(CompactSem);
@@ -1475 +1484 @@
       cnri.pszCnrTitle = dcd->directory;
       WinSendMsg(hwnd,
-                 CM_SETCNRINFO, MPFROMP(&cnri), MPFROMLONG(CMA_CNRTITLE));
+                 CM_SETCNRINFO, MPFROMP(&cnri), MPFROMLONG(CMA_CNRTITLE));
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       dcd->totalfiles = cnri.cRecords;
       commafmt(tb, sizeof(tb), dcd->totalfiles);
       CommaFmtULL(tf, sizeof(tf), dcd->ullTotalBytes, 'K');
+      DosReleaseMutexSem(hmtxFiltering);
       sprintf(s, "%s / %s", tb, tf);
       WinSetDlgItemText(dcd->hwndClient, DIR_TOTALS, s);
@@ -3258 +3269 @@
           else {
 
-            MRESULT mre;
-
-            mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
+            MRESULT mre;
+
+            mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
             if (mre != (MRESULT) - 1)
               return mre;
@@ -3304 +3315 @@
             }
           }
-          if (!dcd->suspendview && hwndMain &&
+          if (!dcd->suspendview && hwndMain && pci->pszFileName != NullStr &&
               (pre->fEmphasisMask & CRA_CURSORED) &&
               (pci->rc.flRecordAttr & CRA_CURSORED) &&
@@ -3513 +3524 @@
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
     if (LastDir == hwnd)
-      LastDir = (HWND) 0;
+        LastDir = (HWND) 0;
+    DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
     if (dcd) {
       dcd->stopflag++;
@@ -3533 +3545 @@
                         SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
-      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
-      free(dcd);
-      DosReleaseMutexSem(hmtxFiltering);
       WinSetWindowPtr(hwnd, QWL_USER, NULL);
       DosPostEventSem(CompactSem);
     }
+    DosReleaseMutexSem(hmtxFiltering);
     WinDestroyWindow(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                     QW_PARENT));
@@ -3555 +3565 @@
     DirMenu = DirCnrMenu = FileMenu = (HWND) 0;
     EmptyCnr(hwnd);
+    DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+    xfree(dcd, pszSrcFile, __LINE__);
+    dcd = NULL;
+    DosReleaseMutexSem(hmtxFiltering);
 #   ifdef FORTIFY
     Fortify_LeaveScope();