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);
+  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 still close a random handle
on the next line.

I guess you cannot continue after this point, so either crash (if that's really
what you want), return here, or avoid registration of this thread.

[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 this point is to use
scoped_platform_handle.Get() because that's the current owner of the handle.

[dsinclair, 2014/01/06 21:30:41]

Done.

       PlatformThread::CurrentId());
 
   delete thread_params;
   delegate->ThreadMain();
 
   ThreadIdNameManager::GetInstance()->RemoveName(
       platform_handle,
       PlatformThread::CurrentId());
   return NULL;
 }
@@ skipping 149 matching lines @@
     case kThreadPriority_RealtimeAudio:
       ::SetThreadPriority(handle.handle_, THREAD_PRIORITY_TIME_CRITICAL);
       break;
     default:
       NOTREACHED() << "Unknown priority.";
       break;
   }
 }
 
 }  // namespace base