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

Unified Diff: chrome/browser/extensions/extension_event_router.cc

Issue 10542130: Merge 141090 - Add some NULL-checks for ExtensionHost::extension to fix a crash bug. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1132/src/
Patch Set: Created 8 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_event_router.cc
===================================================================
--- chrome/browser/extensions/extension_event_router.cc (revision 141761)
+++ chrome/browser/extensions/extension_event_router.cc (working copy)
@@ -425,6 +425,9 @@
// The event ACK is routed to the background host, so this should never be
// NULL.
CHECK(host);
+ if (!host->extension())
+ return;
+
CHECK(host->extension()->has_lazy_background_page());
pm->DecrementLazyKeepaliveCount(host->extension());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698