Close duplicated handle on windows.

base/threading/platform_thread_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/platform_thread.h"
 
 #include "base/debug/alias.h"
 #include "base/debug/profiler.h"
 #include "base/logging.h"
 #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 {
 
 namespace {
 
 // The information on how to set the thread name comes from
 // a MSDN article: http://msdn2.microsoft.com/en-us/library/xcb2z8hs.aspx
 const DWORD kVCThreadNameException = 0x406D1388;
 
@@ skipping 23 matching lines @@
   PlatformThread::Delegate* delegate;
   bool joinable;
 };
 
 DWORD __stdcall ThreadFunc(void* params) {
   ThreadParams* thread_params = static_cast<ThreadParams*>(params);
   PlatformThread::Delegate* delegate = thread_params->delegate;
   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);
+  BOOL didDup = DuplicateHandle(GetCurrentProcess(),

[rvargas (doing something else), 2014/01/07 01:15:39]

nit: did_dup

[dsinclair, 2014/01/07 15:36:36]

Done.

+                                GetCurrentThread(),
+                                GetCurrentProcess(),
+                                &platform_handle,
+                                0,
+                                FALSE,
+                                DUPLICATE_SAME_ACCESS);
 
-  ThreadIdNameManager::GetInstance()->RegisterThread(
-      platform_handle,
-      PlatformThread::CurrentId());
+  win::ScopedHandle scoped_platform_handle;
+
+  if (didDup) {
+    scoped_platform_handle.Set(platform_handle);
+    ThreadIdNameManager::GetInstance()->RegisterThread(
+        scoped_platform_handle.Get(),
+        PlatformThread::CurrentId());
+  }
 
   delete thread_params;
   delegate->ThreadMain();
 
-  ThreadIdNameManager::GetInstance()->RemoveName(
-      platform_handle,
-      PlatformThread::CurrentId());
+  if (didDup) {
+    ThreadIdNameManager::GetInstance()->RemoveName(
+        scoped_platform_handle.Get(),
+        PlatformThread::CurrentId());
+  }
+
   return NULL;
 }
 
 // CreateThreadInternal() matches PlatformThread::Create(), except that
 // |out_thread_handle| may be NULL, in which case a non-joinable thread is
 // created.
 bool CreateThreadInternal(size_t stack_size,
                           PlatformThread::Delegate* delegate,
                           PlatformThreadHandle* out_thread_handle) {
   unsigned int flags = 0;
@@ skipping 141 matching lines @@
     case kThreadPriority_RealtimeAudio:
       ::SetThreadPriority(handle.handle_, THREAD_PRIORITY_TIME_CRITICAL);
       break;
     default:
       NOTREACHED() << "Unknown priority.";
       break;
   }
 }
 
 }  // namespace base