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

Unified Diff: chrome/plugin/plugin_thread.cc

Issue 50075: Fix a plugin crash due to ResourceDispatcher being used after it was deleted... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/plugin_thread.cc
===================================================================
--- chrome/plugin/plugin_thread.cc (revision 12184)
+++ chrome/plugin/plugin_thread.cc (working copy)
@@ -69,7 +69,6 @@
}
void PluginThread::CleanUp() {
- ChildThread::CleanUp();
if (preloaded_plugin_module_) {
FreeLibrary(preloaded_plugin_module_);
preloaded_plugin_module_ = NULL;
@@ -82,6 +81,11 @@
if (webkit_glue::ShouldForcefullyTerminatePluginProcess())
TerminateProcess(GetCurrentProcess(), 0);
+
+ // Call this last because it deletes the ResourceDispatcher, which is used
+ // in some of the above cleanup.
+ // See http://code.google.com/p/chromium/issues/detail?id=8980
+ ChildThread::CleanUp();
}
void PluginThread::OnCreateChannel() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698