summaryrefslogtreecommitdiffstats
path: root/chrome_elf/blacklist
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_elf/blacklist')
-rw-r--r--chrome_elf/blacklist/blacklist.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 6d78608..9915f6c 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -158,7 +158,7 @@ bool LeaveSetupBeacon() {
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;
@@ -227,7 +227,7 @@ bool IsBlacklistInitialized() {
}
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;
}