diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 23:09:25 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 23:09:25 +0000 |
| commit | 8f7cd1dc0619f919df2f8c7c2246c5f2b5e8c389 (patch) | |
| tree | 8e7d0ff15100e61e37dde5310c388b886224ac8a /chrome_elf | |
| parent | 4a780d7a186441db2bbb93c93bca46e05c2ca006 (diff) | |
| download | chromium_src-8f7cd1dc0619f919df2f8c7c2246c5f2b5e8c389.zip chromium_src-8f7cd1dc0619f919df2f8c7c2246c5f2b5e8c389.tar.gz chromium_src-8f7cd1dc0619f919df2f8c7c2246c5f2b5e8c389.tar.bz2 | |
Catch EXCEPTION_GUARD_PAGE in SafeGetImageInfo
SafeGetImageInfo shouldn't raise exceptions.
BUG=348693
Review URL: https://codereview.chromium.org/185533008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/blacklist/blacklist_interceptions.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome_elf/blacklist/blacklist_interceptions.cc b/chrome_elf/blacklist/blacklist_interceptions.cc index 8496c48..28eb692 100644 --- a/chrome_elf/blacklist/blacklist_interceptions.cc +++ b/chrome_elf/blacklist/blacklist_interceptions.cc @@ -150,6 +150,7 @@ void SafeGetImageInfo(const base::win::PEImage& pe, } } } __except((GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || + GetExceptionCode() == EXCEPTION_GUARD_PAGE || GetExceptionCode() == EXCEPTION_IN_PAGE_ERROR) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { out_name->clear(); |