Changeset 1836 for trunk/dll/collect.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/collect.c (modified) (7 diffs)

trunk/dll/collect.c

@@ -89 +89 @@
   02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
                 menu item on a jar file.
+  14 Jun 15 GKY Changes to prevent trap in Filter
 
 ***********************************************************************/
@@ -748 +749 @@
             }
             else {
-              // Update OK
-              if (Filter((PMINIRECORDCORE) pciUpd, (PVOID) & dcd->mask)) {
+              // Update OK
+              DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+              if (dcd && Filter((PMINIRECORDCORE) pciUpd, (PVOID) & dcd->mask)) {
                 pciUpd->rc.flRecordAttr &= ~CRA_FILTERED;       // Ensure visible
                 // 2011-05-29 SHL fixme to check fail
                 WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
                            MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
-              }
+              }
+              DosReleaseMutexSem(hmtxFiltering);
             }
             ulMaxFiles--;               // No insert needed
@@ -913 +916 @@
                               TRUE)) {
               // Already in container
-              pci = UpdateCnrRecord(dcd->hwndCnr, fullname, FALSE, dcd);
-              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
+              pci = UpdateCnrRecord(dcd->hwndCnr, fullname, FALSE, dcd);
+              DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+              if (dcd && Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
                 pci->rc.flRecordAttr &= ~CRA_FILTERED;
                 WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
                            MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
-              }
+              }
+              DosReleaseMutexSem(hmtxFiltering);
             }
             else if (IsFullName(fullname) &&
@@ -1168 +1173 @@
       DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       free(dcd);
+      dcd = NULL;
       DosReleaseMutexSem(hmtxFiltering);
 #     ifdef FORTIFY
@@ -1425 +1431 @@
               p = pci->pszFileName;
             else {
-              if (!pci->pszFileName)
-                Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
-              p = strrchr(pci->pszFileName, '\\');
+              if (!pci->pszFileName) {
+                Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
+                return 0;
+              }
+              p = strrchr(pci->pszFileName, '\\');
               if (p) {
                 if (*(p + 1))
@@ -2128 +2136 @@
             // 2013-12-13 SHL Allow nul pszFileName
             pci = (PCNRITEM) CurrentRecord(hwnd);
-            if (pci && pci->pszFileName && ~pci->attrFile & FILE_DIRECTORY) {
+            if (pci && pci->pszFileName != NullStr && ~pci->attrFile & FILE_DIRECTORY) {
               p = strrchr(pci->pszFileName, '\\');
               if (p) {
@@ -2815 +2823 @@
       case CN_ENDEDIT:
         {
-          MRESULT mre;
-
-          mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
+          MRESULT mre;
+
+          mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
           if (mre != (MRESULT) - 1)
             return mre;