Changeset 74983 in webkit

Timestamp:

Jan 4, 2011 11:29:19 AM (13 years ago)

Author:

dbates@webkit.org

Message:

2011-01-04 Daniel Bates <​dbates@rim.com>

Reviewed by Adam Roben.

LEAK: Deallocate instance of ThreadFunctionInvocation if thread creation fails
​https://bugs.webkit.org/show_bug.cgi?id=51860

• wtf/ThreadingWin.cpp: (WTF::createThreadInternal):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/ThreadingWin.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-04  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Adam Roben.
+
+        LEAK: Deallocate instance of ThreadFunctionInvocation if thread creation fails
+        https://bugs.webkit.org/show_bug.cgi?id=51860
+
+        * wtf/ThreadingWin.cpp:
+        (WTF::createThreadInternal):
+
 2011-01-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/Source/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -209 +209 @@
     unsigned threadIdentifier = 0;
     ThreadIdentifier threadID = 0;
-    ThreadFunctionInvocation* invocation = new ThreadFunctionInvocation(entryPoint, data);
+    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
 #if OS(WINCE)
     // This is safe on WINCE, since CRT is in the core and innately multithreaded.
     // On desktop Windows, need to use _beginthreadex (not available on WinCE) if using any CRT functions
-    HANDLE threadHandle = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)wtfThreadEntryPoint, invocation, 0, (LPDWORD)&threadIdentifier);
+    HANDLE threadHandle = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)wtfThreadEntryPoint, invocation.get(), 0, (LPDWORD)&threadIdentifier);
 #else
-    HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation, 0, &threadIdentifier));
+    HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation.get(), 0, &threadIdentifier));
 #endif
     if (!threadHandle) {
@@ -227 +227 @@
         return 0;
     }
+
+    // The thread will take ownership of invocation.
+    invocation.leakPtr();
 
     threadID = static_cast<ThreadIdentifier>(threadIdentifier);