[1.5>1.6] [1.4>1.5] [MERGE #3092 @leirocks] fix handle leak for recyc…

…ler concurrent thread Merge pull request #3092 from leirocks:handleleak
chakra-core · Jun 2, 2017 · dd8684f · dd8684f
2 parents 6da1e8c + 07c15e7
commit dd8684f
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/Common/Memory/Recycler.cpp b/lib/Common/Memory/Recycler.cpp
@@ -4858,7 +4858,11 @@ Recycler::FinalizeConcurrent(bool restoreState)
     }
 
     this->threadService = nullptr;
-    this->concurrentThread = nullptr;
+    if (concurrentThread != NULL)
+    {
+        CloseHandle(concurrentThread);
+        this->concurrentThread = nullptr;
+    }
 }
 
 bool
@@ -4990,10 +4994,6 @@ Recycler::ShutdownThread()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(false);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
     }
 }
 
@@ -5005,10 +5005,6 @@ Recycler::DisableConcurrent()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(true);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
         this->collectionState = CollectionStateNotCollecting;
     }
 }