diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 20:23:09 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 20:23:09 +0000 |
| commit | 25f0d40c4ee320558323212d90b1167896536814 (patch) | |
| tree | 0f5354263d57772f964555929ebed4a2910c5c22 /chrome_elf | |
| parent | d81ac4a9d9025c85317d233dc8adb50cb5635921 (diff) | |
| download | chromium_src-25f0d40c4ee320558323212d90b1167896536814.zip chromium_src-25f0d40c4ee320558323212d90b1167896536814.tar.gz chromium_src-25f0d40c4ee320558323212d90b1167896536814.tar.bz2 | |
Catch EXCEPTION_IN_PAGE_ERROR errors in SafeGetImageInfo
It is ok for SafeGetImageInfo to fails to get the image info, so catch
exceptions instead of dying.
BUG=343925
Review URL: https://codereview.chromium.org/171153003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/blacklist/blacklist_interceptions.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_elf/blacklist/blacklist_interceptions.cc b/chrome_elf/blacklist/blacklist_interceptions.cc index 642a8b43..9a3bdab 100644 --- a/chrome_elf/blacklist/blacklist_interceptions.cc +++ b/chrome_elf/blacklist/blacklist_interceptions.cc @@ -148,7 +148,8 @@ void SafeGetImageInfo(const base::win::PEImage& pe, *flags |= sandbox::MODULE_HAS_CODE; } } - } __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ? + } __except((GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || + GetExceptionCode() == EXCEPTION_IN_PAGE_ERROR) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { out_name->clear(); } |