[Merge chakra-core/ChakraCore@07c15e7a55] [1.4>1.5] [MERGE #3092 @lei…

…rocks] fix handle leak for recycler concurrent thread Merge pull request #3092 from leirocks:handleleak
nodejs · Jun 5, 2017 · 48524b8 · 48524b8
1 parent f92db9d
commit 48524b8
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/deps/chakrashim/core/lib/Common/Memory/Recycler.cpp b/deps/chakrashim/core/lib/Common/Memory/Recycler.cpp
@@ -4855,7 +4855,11 @@ Recycler::FinalizeConcurrent(bool restoreState)
     }
 
     this->threadService = nullptr;
-    this->concurrentThread = nullptr;
+    if (concurrentThread != NULL)
+    {
+        CloseHandle(concurrentThread);
+        this->concurrentThread = nullptr;
+    }
 }
 
 bool
@@ -4987,10 +4991,6 @@ Recycler::ShutdownThread()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(false);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
     }
 }
 
@@ -5002,10 +5002,6 @@ Recycler::DisableConcurrent()
         Assert(concurrentThread != NULL || threadService->HasCallback());
 
         FinalizeConcurrent(true);
-        if (concurrentThread)
-        {
-            CloseHandle(concurrentThread);
-        }
         this->collectionState = CollectionStateNotCollecting;
     }
 }