Changeset 1799 for trunk/dll/collect.c

Timestamp:

Mar 16, 2015, 11:26:04 PM (11 years ago)

Author:

Gregg Young

Message:

Add fix for trap on close while filtered dir container was still populating to collector, arc container and tree container after collector experienced the same trap. Ticket [535]

File:

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

trunk/dll/collect.c

@@ -84 +84 @@
   13 Dec 13 SHL CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
+  16 Mar 15 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
+                a trap when FM2 is shutdown or the container is closed while collector
+                container is still populating
 
 ***********************************************************************/
@@ -1160 +1163 @@
       FreeList(dcd->lastselection);
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       free(dcd);
+      DosReleaseMutexSem(hmtxFiltering);
 #     ifdef FORTIFY
       Fortify_LeaveScope();