Changeset 1799 for trunk/dll/arccnrs.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/arccnrs.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -106 +106 @@
   06 Apr 14 GKY Removed all BZ/GZ checks
   28 Jun 14 GKY Fix errors identified with CPPCheck; Fix retry to create workdir code
+  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 arc
+                container is still populating
 
 ***********************************************************************/
@@ -2278 +2281 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, 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();