Base: Remove Receive() from ScopedHandle.

In general, the OS API contract doesn't guarantee that output variables are
not modified on failure, so a Reeceive pattern is fundamentally insecure.

BUG=318531
TEST=current tests

tbr'ing owners for the consumers.

TBR=jvoung@chromium.org, thakis@chromium.org, sergeyu@chromium.org, grt@chromium.org, gene@chromium.org, youngki@chromium.org

Review URL: https://codereview.chromium.org/71013004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237459 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 2 deletions

diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
index bbe1655..b44836c 100644
--- a/net/base/net_util_win.cc
+++ b/net/base/net_util_win.cc
@@ -61,6 +61,17 @@ struct WlanApi {
                   close_handle_func;
   }
 
+  template <typename T>
+  DWORD OpenHandle(DWORD client_version, DWORD* cur_version, T* handle) const {
+    HANDLE temp_handle;
+    DWORD result = open_handle_func(client_version, NULL, cur_version,
+                                    &temp_handle);
+    if (result != ERROR_SUCCESS)
+      return result;
+    handle->Set(temp_handle);
+    return ERROR_SUCCESS;
+  }
+
   HMODULE module;
   WlanOpenHandleFunc open_handle_func;
   WlanEnumInterfacesFunc enum_interfaces_func;
@@ -236,8 +247,7 @@ WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
   WlanHandle client;
   DWORD cur_version = 0;
   const DWORD kMaxClientVersion = 2;
-  DWORD result = wlanapi.open_handle_func(kMaxClientVersion, NULL, &cur_version,
-                                          client.Receive());
+  DWORD result = wlanapi.OpenHandle(kMaxClientVersion, &cur_version, &client);
   if (result != ERROR_SUCCESS)
     return WIFI_PHY_LAYER_PROTOCOL_NONE;