Changeset 2164

Timestamp:

6/13/2010 3:58:53 AM (2 years ago)

Author:

lowjoel

Message:

Fixed potential crash when ResolveHandleName? is called by two threads at the same time (since the initialisation order of the Handle is undefined)

File:

• trunk/eraser/Eraser.Util.Native/OpenHandle.NameResolver.cpp (modified) (4 diffs)

trunk/eraser/Eraser.Util.Native/OpenHandle.NameResolver.cpp

@@ -26 +26 @@
 
 namespace {
-    HANDLE NameResolutionThread;
-    NameResolutionThreadParams NameResolutionThreadParam;
-
     DWORD __stdcall nameResolutionThread(void* data)
     {
@@ -101 +98 @@
         handle = CreateThread(NULL, 0, nameResolutionThread, &params, 0, NULL);
     }
-
 }
 
 std::wstring ResolveHandleName(HANDLE handle, int pid)
 {
+    static HANDLE thread = NULL;
+    static NameResolutionThreadParams params;
+
     //Start a name resolution thread (in case one entry hangs)
-    if (NameResolutionThread == NULL)
-        CreateNameThread(NameResolutionThread, NameResolutionThreadParam);
+    if (thread == NULL)
+        CreateNameThread(thread, params);
 
     //Create a duplicate handle
@@ -123 +122 @@
     //Send the handle to the secondary thread for name resolution
     NameResult result(localHandle);
-    NameResolutionThreadParam.Input.push_back(&result);
-    ReleaseSemaphore(NameResolutionThreadParam.Semaphore, 1, NULL);
+    params.Input.push_back(&result);
+    ReleaseSemaphore(params.Semaphore, 1, NULL);
 
     //Wait for the result
@@ -130 +129 @@
     {
         //The wait failed. Terminate the thread and recreate another.
-        CreateNameThread(NameResolutionThread, NameResolutionThreadParam);
+        CreateNameThread(thread, params);
     }