summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 00:39:13 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 00:39:13 +0000
commitf9444c93570ba48a70a69cff7568db87377f41b6 (patch)
tree15de7b1dbfa89d9f57b2f0a1ec747d1ab8a863e9 /chrome/plugin
parent4d388af43940b398919ac8c2aebae2db4174c9b1 (diff)
downloadchromium_src-f9444c93570ba48a70a69cff7568db87377f41b6.zip
chromium_src-f9444c93570ba48a70a69cff7568db87377f41b6.tar.gz
chromium_src-f9444c93570ba48a70a69cff7568db87377f41b6.tar.bz2
Merge 72107 - Make sure the process is _really_ gone after a __debugbreak(). We've had a
few annoying cases where someone has been monitoring Chrome under windbg, which can skip over __debugbreak() and then show them a scary-looking access violation. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6372008 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/6250095 git-svn-id: svn://svn.chromium.org/chrome/branches/597/src@73390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 9d97ed9..a2437d8 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -160,8 +160,10 @@ int PluginMain(const MainFunctionParams& parameters) {
BOOL result = run_security_tests(&test_count);
DCHECK(result) << "Test number " << test_count << " has failed.";
// If we are in release mode, crash or debug the process.
- if (!result)
+ if (!result) {
__debugbreak();
+ _exit(1);
+ }
}
FreeLibrary(sandbox_test_module);