Changeset 1799 for trunk/dll/treecnr.c

Timestamp:

Mar 16, 2015, 11:26:04 PM (10 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/treecnr.c (modified) (2 diffs)

trunk/dll/treecnr.c

@@ -94 +94 @@
                 by RWS but I think the occasional extra blank directory or duplicating
                 directories is related.
+  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 tree
+                container is still populating
 
 ***********************************************************************/
@@ -1012 +1015 @@
                  UM_CLOSE, MPFROMLONG(dcd->dontclose != FALSE), MPVOID);
       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();