Merge 37638 - Correct the length of the string saved to the "dr" registry val...

chrome/app/client_util.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <shlwapi.h>
 
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
 #include "chrome/common/result_codes.h"
@@ skipping 78 matching lines @@
 }
 
 // Set did_run "dr" in omaha's client state for this product.
 bool SetDidRunState(const wchar_t* guid, const wchar_t* value) {
   std::wstring key_path(google_update::kRegPathClientState);
   key_path.append(L"\\").append(guid);
   HKEY reg_key;
   if (::RegCreateKeyExW(HKEY_CURRENT_USER, key_path.c_str(), 0, NULL,
                         REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL,
                         &reg_key, NULL) == ERROR_SUCCESS) {
+    // Note that the length here must be in bytes and must account for the
+    // terminating null char.
     ::RegSetValueExW(reg_key, google_update::kRegDidRunField, 0, REG_SZ,
-                     reinterpret_cast<const BYTE *>(value), ::lstrlenW(value));
+                     reinterpret_cast<const BYTE *>(value),
+                     (::lstrlenW(value) + 1) * sizeof(wchar_t));
     ::RegCloseKey(reg_key);
     return true;
   }
   return false;
 }
 
 bool RecordDidRun(const wchar_t* guid) {
   return SetDidRunState(guid, L"1");
 }
 
@@ skipping 104 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }