Various cleanups.

chrome/installer/mini_installer/regkey.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 "chrome/installer/mini_installer/regkey.h"
 
 #include "chrome/installer/mini_installer/mini_installer_constants.h"
 #include "chrome/installer/mini_installer/mini_string.h"
 
 namespace mini_installer {
 
 LONG RegKey::Open(HKEY key, const wchar_t* sub_key, REGSAM access) {
   Close();
   return ::RegOpenKeyEx(key, sub_key, NULL, access, &key_);
 }
 
 LONG RegKey::ReadSZValue(const wchar_t* value_name,
                          wchar_t* value,
                          size_t value_size) const {
   DWORD type = 0;
   DWORD byte_length = static_cast<DWORD>(value_size * sizeof(wchar_t));
   LONG result = ::RegQueryValueEx(key_, value_name, NULL, &type,
                                   reinterpret_cast<BYTE*>(value),
                                   &byte_length);
   if (result == ERROR_SUCCESS) {
     if (type != REG_SZ) {
       result = ERROR_NOT_SUPPORTED;
-    } else if (byte_length == 0) {
+    } else if (byte_length < 2) {
       *value = L'\0';
     } else if (value[byte_length/sizeof(wchar_t) - 1] != L'\0') {
       if ((byte_length / sizeof(wchar_t)) < value_size)
         value[byte_length / sizeof(wchar_t)] = L'\0';
       else
         result = ERROR_MORE_DATA;
     }
   }
   return result;
 }
@@ skipping 66 matching lines @@
   if (!client_state_key.assign(kClientStateKeyBase))
     return ERROR_BUFFER_OVERFLOW;
 #if defined(GOOGLE_CHROME_BUILD)
   if (!client_state_key.append(app_guid))
     return ERROR_BUFFER_OVERFLOW;
 #endif
   return key->Open(root_key, client_state_key.get(), access | KEY_WOW64_32KEY);
 }
 
 }  // namespace mini_installer