summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 20:12:51 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 20:12:51 +0000
commita3a8fb6d3692cf61db8cfed20e15e83916e6602b (patch)
treea1eeaccf812b0c43747d9674d3b0d13ad37a39e6 /webkit
parentef65f48857ee9d56b841f5285d087f07f102b49f (diff)
downloadchromium_src-a3a8fb6d3692cf61db8cfed20e15e83916e6602b.zip
chromium_src-a3a8fb6d3692cf61db8cfed20e15e83916e6602b.tar.gz
chromium_src-a3a8fb6d3692cf61db8cfed20e15e83916e6602b.tar.bz2
Fix renderer hang if plugin process crashes while initializing a plugin.
BUG=25104 Review URL: http://codereview.chromium.org/315012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webplugin_impl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 7d4bbdc..6c67b92 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -835,6 +835,8 @@ void WebPluginImpl::HandleURLRequestInternal(
int resource_id = GetNextResourceId();
WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
resource_id, complete_url, notify, notify_data, NULL);
+ if (!resource_client)
+ return;
// If the RouteToFrame call returned a failure then inform the result
// back to the plugin asynchronously.