Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: sandbox/win/src/sandbox_nt_util.cc

Issue 667573009: Give PEImage a virtual destructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Suppress the SEH warning instead Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/pe_image.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/sandbox_nt_util.cc
diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc
index 28ddd47bff43262a9043d163e575c194909d1870..12dd7d8c88c72b561b6ba814b789e3d217ded5c1 100644
--- a/sandbox/win/src/sandbox_nt_util.cc
+++ b/sandbox/win/src/sandbox_nt_util.cc
@@ -361,6 +361,9 @@ UNICODE_STRING* AnsiToUnicode(const char* string) {
}
UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32* flags) {
+ // PEImage's dtor won't be run during SEH unwinding, but that's OK.
+#pragma warning(push)
+#pragma warning(disable: 4509)
UNICODE_STRING* out_name = NULL;
__try {
do {
@@ -389,6 +392,7 @@ UNICODE_STRING* GetImageInfoFromModule(HMODULE module, uint32* flags) {
}
return out_name;
+#pragma warning(pop)
}
UNICODE_STRING* GetBackingFilePath(PVOID address) {
« no previous file with comments | « base/win/pe_image.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698