summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 21:31:40 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 21:31:40 +0000
commitcf0de89088da61db5f7f3d182f69635ac7e8e1d3 (patch)
tree3b1b891af989d43dcaeff651b438514a0242fe0e /chrome/browser/extensions
parent565477eb0d0c55a21e4b7d8967c13b998f119f09 (diff)
downloadchromium_src-cf0de89088da61db5f7f3d182f69635ac7e8e1d3.zip
chromium_src-cf0de89088da61db5f7f3d182f69635ac7e8e1d3.tar.gz
chromium_src-cf0de89088da61db5f7f3d182f69635ac7e8e1d3.tar.bz2
Fix crash bug in ExtensionMessageService.
TBR=yoz BUG=118673 TEST=no Review URL: https://chromiumcodereview.appspot.com/9717008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_message_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index c2f81df..6a14c1a 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -435,7 +435,7 @@ bool ExtensionMessageService::MaybeAddPendingOpenChannelTask(
ExtensionService* service = profile->GetExtensionService();
const std::string& extension_id = params.target_extension_id;
const Extension* extension = service->extensions()->GetByID(extension_id);
- if (!extension->background_page_persists()) {
+ if (extension && !extension->background_page_persists()) {
// If the extension uses spanning incognito mode, make sure we're always
// using the original profile since that is what the extension process
// will use.