summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 22:49:01 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 22:49:01 +0000
commit4ed2e36260b3ef4cd004b4787f62d54aa3d47d28 (patch)
tree3cfcbfecebd503bdb2afefcc923607b91a82be56 /chrome
parent8192f7ec20cb61256aea5023b8580f44b0988711 (diff)
downloadchromium_src-4ed2e36260b3ef4cd004b4787f62d54aa3d47d28.zip
chromium_src-4ed2e36260b3ef4cd004b4787f62d54aa3d47d28.tar.gz
chromium_src-4ed2e36260b3ef4cd004b4787f62d54aa3d47d28.tar.bz2
Fix a crash in ExtensionMessageService when a source renderer closed.
BUG=27554 Review URL: http://codereview.chromium.org/384097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_message_service.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 2957f71..1befb54 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -247,6 +247,9 @@ void ExtensionMessageService::OpenChannelToExtensionOnUIThread(
return;
RenderProcessHost* source = RenderProcessHost::FromID(source_process_id);
+ if (!source)
+ return;
+
MessagePort receiver(
profile_->GetExtensionProcessManager()->GetExtensionProcess(
target_extension_id),
@@ -265,6 +268,9 @@ void ExtensionMessageService::OpenChannelToTabOnUIThread(
int tab_id, const std::string& extension_id,
const std::string& channel_name) {
RenderProcessHost* source = RenderProcessHost::FromID(source_process_id);
+ if (!source)
+ return;
+
TabContents* contents;
MessagePort receiver;
receiver.debug_info = 2;