diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 22:22:53 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 22:22:53 +0000 |
| commit | 2a8768230c4fe626812d1594f4d782b72b187c19 (patch) | |
| tree | 0ed4514c11d2b7c25ac254223542eb48a523ecca /chrome_elf | |
| parent | de3c5d8429987bd13bcf5c428be7d44b823a8391 (diff) | |
| download | chromium_src-2a8768230c4fe626812d1594f4d782b72b187c19.zip chromium_src-2a8768230c4fe626812d1594f4d782b72b187c19.tar.gz chromium_src-2a8768230c4fe626812d1594f4d782b72b187c19.tar.bz2 | |
Increase accuracy when determining if the browser blacklist was setup.
BUG=
Review URL: https://codereview.chromium.org/298893004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/blacklist/blacklist.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc index 705cc60..a168c9a 100644 --- a/chrome_elf/blacklist/blacklist.cc +++ b/chrome_elf/blacklist/blacklist.cc @@ -279,9 +279,6 @@ bool Initialize(bool force) { key = NULL; } - // Record that we have initialized the blacklist. - g_blacklist_initialized = true; - BYTE* thunk_storage = reinterpret_cast<BYTE*>(&g_thunk_storage); // Mark the thunk storage as readable and writeable, since we @@ -334,6 +331,9 @@ bool Initialize(bool force) { #endif delete thunk; + // Record if we have initialized the blacklist. + g_blacklist_initialized = NT_SUCCESS(ret); + // Mark the thunk storage as executable and prevent any future writes to it. page_executable = page_executable && VirtualProtect(&g_thunk_storage, sizeof(g_thunk_storage), |