Skip to content

Commit

Permalink
Catch EXCEPTION_IN_PAGE_ERROR errors in SafeGetImageInfo
Browse files Browse the repository at this point in the history
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
  • Loading branch information
csharp@chromium.org committed Feb 19, 2014
1 parent d81ac4a commit 25f0d40
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion chrome_elf/blacklist/blacklist_interceptions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 25f0d40

Please sign in to comment.