Commit a3e007d4 authored by jamescook's avatar jamescook Committed by Commit bot

Fix crash in ChromeExtensionMessageFilter::OnPostMessage

Speculative fix: ChromeExtensionMessageFilter can outlive its Profile, so
check |profile_| for NULL in OnPostMessage as is done in other message
handlers.

BUG=419047
TEST=none

Review URL: https://codereview.chromium.org/617053002

Cr-Commit-Position: refs/heads/master@{#297531}
parent 42f9b97a
...@@ -229,6 +229,9 @@ void ChromeExtensionMessageFilter::OpenChannelToTabOnUIThread( ...@@ -229,6 +229,9 @@ void ChromeExtensionMessageFilter::OpenChannelToTabOnUIThread(
void ChromeExtensionMessageFilter::OnPostMessage( void ChromeExtensionMessageFilter::OnPostMessage(
int port_id, int port_id,
const extensions::Message& message) { const extensions::Message& message) {
if (!profile_)
return;
extensions::MessageService::Get(profile_)->PostMessage(port_id, message); extensions::MessageService::Get(profile_)->PostMessage(port_id, message);
} }
...@@ -269,6 +272,9 @@ void ChromeExtensionMessageFilter::OnGetExtMessageBundleOnBlockingPool( ...@@ -269,6 +272,9 @@ void ChromeExtensionMessageFilter::OnGetExtMessageBundleOnBlockingPool(
void ChromeExtensionMessageFilter::OnExtensionCloseChannel( void ChromeExtensionMessageFilter::OnExtensionCloseChannel(
int port_id, int port_id,
const std::string& error_message) { const std::string& error_message) {
if (!profile_)
return;
if (!content::RenderProcessHost::FromID(render_process_id_)) if (!content::RenderProcessHost::FromID(render_process_id_))
return; // To guard against crash in browser_tests shutdown. return; // To guard against crash in browser_tests shutdown.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment