Check for CloseHandle failures even when not debugging

chrome/app/close_handle_hook_win.cc

 // Copyright 2014 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 "chrome/app/close_handle_hook_win.h"
 
 #include <Windows.h>
 #include <psapi.h>
 
 #include <vector>
@@ skipping 19 matching lines @@
                                            DWORD options);
 
 CloseHandleType g_close_function = NULL;
 DuplicateHandleType g_duplicate_function = NULL;
 
 // The entry point for CloseHandle interception. This function notifies the
 // verifier about the handle that is being closed, and calls the original
 // function.
 BOOL WINAPI CloseHandleHook(HANDLE handle) {
   base::win::OnHandleBeingClosed(handle);
-  return g_close_function(handle);
+  BOOL result = g_close_function(handle);
+  // Check for CloseHandle failures.
+  // urlmon closes a handle that is NULL so we can't fail on that.
+  // Also CloseHandle() under a debugger only throws an exception on handles
+  // that are neither NULL nor INVALID_HANDLE_VALUE.
+  DCHECK(result || handle == NULL || handle == INVALID_HANDLE_VALUE);

[grt (UTC plus 2), 2015/09/15 14:08:07]

nit: DPCHECK so that the last error code is nicely formatted

[brucedawson, 2015/09/15 16:49:27]

Done.

+  return result;
 }
 
 BOOL WINAPI DuplicateHandleHook(HANDLE source_process,
                                 HANDLE source_handle,
                                 HANDLE target_process,
                                 HANDLE* target_handle,
                                 DWORD desired_access,
                                 BOOL inherit_handle,
                                 DWORD options) {
   if ((options & DUPLICATE_CLOSE_SOURCE) &&
@@ skipping 223 matching lines @@
     // threads attempting to call CloseHandle.
     hooks->AddEATPatch();
     PatchLoadedModules(hooks);
   }
 }
 
 void RemoveHandleHooks() {
   // We are partching all loaded modules without forcing them to stay in memory,
   // removing patches is not safe.
 }