Index: base/threading/platform_thread_win.cc |
diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc |
index e9752ba21394c671d1d84214e4cd65078bd940f3..b977373563f1b712c43a1ac249e99a84944ab5b7 100644 |
--- a/base/threading/platform_thread_win.cc |
+++ b/base/threading/platform_thread_win.cc |
@@ -10,7 +10,7 @@ |
#include "base/threading/thread_id_name_manager.h" |
#include "base/threading/thread_restrictions.h" |
#include "base/tracked_objects.h" |
- |
+#include "base/win/scoped_handle.h" |
#include "base/win/windows_version.h" |
namespace base { |
@@ -54,17 +54,20 @@ DWORD __stdcall ThreadFunc(void* params) { |
if (!thread_params->joinable) |
base::ThreadRestrictions::SetSingletonAllowed(false); |
- /* Retrieve a copy of the thread handle to use as the key in the |
- * thread name mapping. */ |
+ // Retrieve a copy of the thread handle to use as the key in the |
+ // thread name mapping. |
PlatformThreadHandle::Handle platform_handle; |
- DuplicateHandle( |
- GetCurrentProcess(), |
- GetCurrentThread(), |
- GetCurrentProcess(), |
- &platform_handle, |
- 0, |
- FALSE, |
- DUPLICATE_SAME_ACCESS); |
+ if (!DuplicateHandle(GetCurrentProcess(), |
+ GetCurrentThread(), |
+ GetCurrentProcess(), |
+ &platform_handle, |
+ 0, |
+ FALSE, |
+ DUPLICATE_SAME_ACCESS)) { |
+ NOTREACHED(); |
rvargas (doing something else)
2013/12/14 02:29:55
This is a nop on release builds so this code could
dsinclair
2014/01/06 21:30:41
Done.
|
+ } |
+ |
+ win::ScopedHandle scoped_platform_handle(platform_handle); |
ThreadIdNameManager::GetInstance()->RegisterThread( |
platform_handle, |
rvargas (doing something else)
2013/12/14 02:29:55
it doesn't matter much, but the "correct" thing at
dsinclair
2014/01/06 21:30:41
Done.
|