diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 19:07:32 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 19:07:32 +0000 |
| commit | 65c700b30e47d40b2dd2dd9b99cb4062ed4472bd (patch) | |
| tree | 5c3777362ba41f3d95839bab035cdd5375263ad6 | |
| parent | 2fbd8c896a59852fffac830995e36bae3fe124d0 (diff) | |
| download | chromium_src-65c700b30e47d40b2dd2dd9b99cb4062ed4472bd.zip chromium_src-65c700b30e47d40b2dd2dd9b99cb4062ed4472bd.tar.gz chromium_src-65c700b30e47d40b2dd2dd9b99cb4062ed4472bd.tar.bz2 | |
Merge 157560 - Fix crash in Extension::GetBrowserImages()
BUG=150763
TEST=successfully installed browser action extension without default icon defined in manifest
Review URL: https://codereview.chromium.org/10945026
TBR=tbarzic@chromium.org
Review URL: https://codereview.chromium.org/10943035
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@157580 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/extension.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index f042c988e..1b3e947 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(); |