Fix two minor bugs found by /analyze

chrome_elf/blacklist/blacklist.cc

 // Copyright 2013 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_elf/blacklist/blacklist.h"
 
 #include <assert.h>
 #include <string.h>
 
 #include <vector>
@@ skipping 140 matching lines @@
   DWORD blacklist_state = BLACKLIST_STATE_MAX;
   DWORD blacklist_state_size = sizeof(blacklist_state);
   DWORD type = 0;
   result = ::RegQueryValueEx(key,
                              kBeaconState,
                              0,
                              &type,
                              reinterpret_cast<LPBYTE>(&blacklist_state),
                              &blacklist_state_size);
 
-  if (blacklist_state == BLACKLIST_DISABLED || result != ERROR_SUCCESS ||
+  if (result != ERROR_SUCCESS || blacklist_state == BLACKLIST_DISABLED ||
       type != REG_DWORD) {
     ::RegCloseKey(key);
     return false;
   }
 
   if (!GenerateStateFromBeaconAndAttemptCount(&key, blacklist_state)) {
     ::RegCloseKey(key);
     return false;
   }
 
@@ skipping 48 matching lines @@
   while (blacklist::g_troublesome_dlls[++size] != NULL) {}
 
   return size;
 }
 
 bool IsBlacklistInitialized() {
   return g_blacklist_initialized;
 }
 
 int GetBlacklistIndex(const wchar_t* dll_name) {
-  for (int i = 0; i < kTroublesomeDllsMaxCount, g_troublesome_dlls[i]; ++i) {
+  for (int i = 0; i < kTroublesomeDllsMaxCount && g_troublesome_dlls[i]; ++i) {
     if (_wcsicmp(dll_name, g_troublesome_dlls[i]) == 0)
       return i;
   }
   return -1;
 }
 
 bool AddDllToBlacklist(const wchar_t* dll_name) {
   int blacklist_size = BlacklistSize();
   // We need to leave one space at the end for the null pointer.
   if (blacklist_size + 1 >= kTroublesomeDllsMaxCount)
@@ skipping 190 matching lines @@
       break;
     value_buffer[value_len - 1] = L'\0';
     AddDllToBlacklist(&value_buffer[0]);
   }
 
   ::RegCloseKey(key);
   return;
 }
 
 }  // namespace blacklist