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

Unified Diff: chrome/common/extensions/extension.cc

Issue 10945026: Fix crash in Extension::GetBrowserImages() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index f042c988ef4d6158bd44f2c49a9bb95d9b5d4642..1b3e947a1b50a4fadc104b8175c0f88978ceaca4 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -3243,7 +3243,7 @@ std::set<FilePath> Extension::GetBrowserImages() const {
}
}
- if (page_action()) {
+ if (page_action() && page_action()->default_icon()) {
for (ExtensionIconSet::IconMap::const_iterator iter =
page_action()->default_icon()->map().begin();
iter != page_action()->default_icon()->map().end();
@@ -3252,7 +3252,7 @@ std::set<FilePath> Extension::GetBrowserImages() const {
}
}
- if (browser_action()) {
+ if (browser_action() && browser_action()->default_icon()) {
for (ExtensionIconSet::IconMap::const_iterator iter =
browser_action()->default_icon()->map().begin();
iter != browser_action()->default_icon()->map().end();
« 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