diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 23:22:10 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 23:22:10 +0000 |
| commit | aaa8f2d5de93c03b7e1dc8bc474d2fdbc7a7bc44 (patch) | |
| tree | df348276742fe2d89b4d5e832ea0406fae140b94 /chrome/browser/extensions/extension_file_util.cc | |
| parent | 09729a552e7fdba21a70c132a1e4a21068a2d851 (diff) | |
| download | chromium_src-aaa8f2d5de93c03b7e1dc8bc474d2fdbc7a7bc44.zip chromium_src-aaa8f2d5de93c03b7e1dc8bc474d2fdbc7a7bc44.tar.gz chromium_src-aaa8f2d5de93c03b7e1dc8bc474d2fdbc7a7bc44.tar.bz2 | |
Put the null pointer check for theme images before we use the
pointer.
This was crashing for me with the theme I had installed.
Review URL: http://codereview.chromium.org/160550
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_file_util.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_file_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc index 15e3cf8..b46404c 100644 --- a/chrome/browser/extensions/extension_file_util.cc +++ b/chrome/browser/extensions/extension_file_util.cc @@ -196,8 +196,8 @@ Extension* LoadExtension(const FilePath& extension_path, bool require_key, // Theme resource validation. if (extension->IsTheme()) { DictionaryValue* images_value = extension->GetThemeImages(); - DictionaryValue::key_iterator iter = images_value->begin_keys(); if (images_value) { + DictionaryValue::key_iterator iter = images_value->begin_keys(); while (iter != images_value->end_keys()) { std::string val; if (images_value->GetString(*iter , &val)) { |