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

trunk/dll/comp.c

@@ -91 +91 @@
                 Added saymsg2 for this purpose
   10 Mar 13 GKY Fixes to snapshot file.
+  14 Jun 15 GKY Changes to prvenet access violations when cmp is freed
 
 ***********************************************************************/
@@ -944 +945 @@
 #    endif
   }
-  else
+  else {
+    DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
     free(cmp);
+    cmp = NULL;
+    DosReleaseMutexSem(hmtxFiltering);
+  }
 }
 
@@ -1994 +1999 @@
             pcil->crtime.seconds = filesl[l]->crtime.twosecs * 2;
             pcil->crtime.minutes = filesl[l]->crtime.minutes;
-            pcil->crtime.hours = filesl[l]->crtime.hours;
-            if (*cmp->dcd.mask.szMask) {
+            pcil->crtime.hours = filesl[l]->crtime.hours;
+            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+            if (cmp && *cmp->dcd.mask.szMask) {
               if (!Filter((PMINIRECORDCORE)pcil, (PVOID)&cmp->dcd.mask)) {
                 pcil->rc.flRecordAttr |= CRA_FILTERED;
                 pcir->rc.flRecordAttr |= CRA_FILTERED;
-              }
-            }
+              }
+            }
+            DosReleaseMutexSem(hmtxFiltering);
           } // if on left
 
@@ -2036 +2043 @@
             pcir->crtime.minutes = filesr[r]->crtime.minutes;
             pcir->crtime.hours = filesr[r]->crtime.hours;
-            // Bypass check if already filtered on left side
-            if (~pcir->rc.flRecordAttr & CRA_FILTERED &&
+            // Bypass check if already filtered on left side
+            DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+            if (cmp && ~pcir->rc.flRecordAttr & CRA_FILTERED &&
                 *cmp->dcd.mask.szMask) {
               if (!Filter((PMINIRECORDCORE)pcir, (PVOID)&cmp->dcd.mask)) {
                 pcil->rc.flRecordAttr |= CRA_FILTERED;
                 pcir->rc.flRecordAttr |= CRA_FILTERED;
-              }
-            }
+              }
+            }
+            DosReleaseMutexSem(hmtxFiltering);
           } // if on right
 
@@ -2241 +2250 @@
     WinTerminate(hab);
   }
+  DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
   free(cmp);
+  cmp = NULL;
+  DosReleaseMutexSem(hmtxFiltering);
   DosPostEventSem(CompactSem);
 
@@ -2566 +2578 @@
         // 01 Aug 07 SHL if field null or blank, we draw
         // fixme to document why - probably to optimize and bypass draw?
-        if (pci && (INT)pci != -1 && !*pci->pszFileName)
+        if (pci && (INT)pci != -1 && !*pci->pszFileName && pci->pszFileName != NullStr)
           return MRFROMLONG(TRUE);
       }
@@ -3542 +3554 @@
           WinSendMsg(cmp->dcd.hwndObject, WM_CLOSE, MPVOID, MPVOID);
       }
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       free(cmp);
+      cmp = NULL;
+      DosReleaseMutexSem(hmtxFiltering);
     }
     EmptyCnr(GetHwndLeft(hwnd));