commit b2e746e82cec7fbcca409efbcf327cc54d81f795
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri May 23 18:40:46 2014
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri May 23 18:40:46 2014
tree 26b31d44294bf4ba6d0eb47c5b05d8fafc700aa3
parent 0631e37660e5e9b1566089c8306094ad6ee9516e

Rebase webrtc/base with r6232:
cd webrtc/base
svn diff -r 6231:6232 http://webrtc.googlecode.com/svn/trunk/talk/base > 6232.diff
patch -p0 -i 6232.diff

BUG=3379
TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6239 4adac7df-926f-26a2-2b94-8c16560cd09d

base/proxydetect.cc

diff --git a/base/proxydetect.cc b/base/proxydetect.cc
index 7168886..7265f4f 100644
--- a/base/proxydetect.cc
+++ b/base/proxydetect.cc
@@ -621,27 +621,27 @@
   if (ERROR_SUCCESS != result)
     return false;
 
-  wchar_t* value = NULL;
   DWORD size, type;
+  bool success = false;
   result = RegQueryValueEx(key, L"", 0, &type, NULL, &size);
-  if (REG_SZ != type) {
-    result = ERROR_ACCESS_DENIED;  // Any error is fine
-  } else if (ERROR_SUCCESS == result) {
-    value = new wchar_t[size+1];
+  if (result == ERROR_SUCCESS && type == REG_SZ) {
+    wchar_t* value = new wchar_t[size+1];
     BYTE* buffer = reinterpret_cast<BYTE*>(value);
     result = RegQueryValueEx(key, L"", 0, &type, buffer, &size);
-  }
-  RegCloseKey(key);
-
-  bool success = false;
-  if (ERROR_SUCCESS == result) {
-    value[size] = L'\0';
-    for (size_t i = 0; i < size; ++i) {
-      value[i] = tolowercase(value[i]);
+    if (result == ERROR_SUCCESS) {
+      // Size returned by RegQueryValueEx is in bytes, convert to number of
+      // wchar_t's.
+      size /= sizeof(value[0]);
+      value[size] = L'\0';
+      for (size_t i = 0; i < size; ++i) {
+        value[i] = tolowercase(value[i]);
+      }
+      success = (NULL != strstr(value, L"firefox.exe"));
     }
-    success = (NULL != strstr(value, L"firefox.exe"));
+    delete[] value;
   }
-  delete [] value;
+
+  RegCloseKey(key);
   return success;
 }