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

Unified Diff: ppapi/proxy/host_dispatcher.cc

Issue 8098001: Fix a crash in the renderer process which occurs in the PPAPI host code due to the underlying plugin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | webkit/plugins/ppapi/plugin_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/host_dispatcher.cc
===================================================================
--- ppapi/proxy/host_dispatcher.cc (revision 103325)
+++ ppapi/proxy/host_dispatcher.cc (working copy)
@@ -134,11 +134,12 @@
TRACE_EVENT2("ppapi proxy", "HostDispatcher::Send",
"Class", IPC_MESSAGE_ID_CLASS(msg->type()),
"Line", IPC_MESSAGE_ID_LINE(msg->type()));
- // Normal sync messages are set to unblock, which would normally cause the
- // plugin to be reentered to process them. We only want to do this when we
- // know the plugin is in a state to accept reentrancy. Since the plugin side
- // never clears this flag on messages it sends, we can't get deadlock, but we
- // may still get reentrancy in the host as a result.
+ // Prevent the dispatcher from going away during the call. Scenarios
+ // where this could happen include a Send for a sync message which while
+ // waiting for the reply, dispatches an incoming ExecuteScript call which
+ // destroys the plugin module and in turn the dispatcher,
+ ScopedModuleReference ref(this);
+
if (!allow_plugin_reentrancy_)
msg->set_unblock(false);
return Dispatcher::Send(msg);
« no previous file with comments | « no previous file | webkit/plugins/ppapi/plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698