Changeset 1797 for trunk

Timestamp:

Sep 10, 2014, 1:56:52 AM (11 years ago)

Author:

Gregg Young

Message:

Found two instances of mask and/or mask->szMask outside the Filter semaphore. The second one trapped. This fix puts them all inside the Filter semaphore which prevents dcd from being freed. So far so good.

File:

• trunk/dll/filter.c (modified) (2 diffs)

trunk/dll/filter.c

@@ -83 +83 @@
   CHAR *file;
 
-  if (!mask)
-    return TRUE;                        // No mask data
-
   DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+  if (!mask) {
+    DosReleaseMutexSem(hmtxFiltering);
+    return TRUE;
+  } // No mask data
+
   pci = (PCNRITEM) rmini;
   // Always show root directory
@@ -128 +130 @@
     file = pci->pszFileName;
 
-  if (!mask->pszMasks[1]) {
+  if (!mask->pszMasks[1]) { // Just one mask string
+    BOOL wild = wildcard(strchr(mask->szMask, '\\') || strchr(mask->szMask, ':') ?
+                         pci->pszFileName : file, mask->szMask, FALSE);
     DosReleaseMutexSem(hmtxFiltering);
-    // Just one mask string
-    return wildcard(strchr(mask->szMask, '\\') ||
-                      strchr(mask->szMask, ':') ?
-                        pci->pszFileName : file,
-                    mask->szMask,
-                    FALSE);
+    return wild;
   }