summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/location_bar_view.cc
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 15:34:07 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 15:34:07 +0000
commit04870625cb2918e19f0cf1e8a864cce853dbcbde (patch)
tree4ad6fabc38f84933b00e490825b4cca6d553da91 /chrome/browser/views/location_bar_view.cc
parentd53c570c46b5760f10d612babf1fb0048543d38d (diff)
downloadchromium_src-04870625cb2918e19f0cf1e8a864cce853dbcbde.zip
chromium_src-04870625cb2918e19f0cf1e8a864cce853dbcbde.tar.gz
chromium_src-04870625cb2918e19f0cf1e8a864cce853dbcbde.tar.bz2
LocationBarView::PageActionImageView::LoadImageTask::Run() may pass a NULL image pointer through to OnImageLoaded; make sure that the pointer is not dereferenced in these cases.
BUG= http://crbug.com/18140 TEST= none. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=22213 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=22254 Review URL: http://codereview.chromium.org/159711 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/location_bar_view.cc')
-rw-r--r--chrome/browser/views/location_bar_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 6e26c9c..674cdb6 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1161,7 +1161,7 @@ class LocationBarView::PageActionImageView::ImageLoadingTracker
void OnImageLoaded(SkBitmap* image, int index) {
if (image == NULL) {
- NOTREACHED();
+ NOTREACHED() << "Image failed to decode.";
image = new SkBitmap();
}
if (view_)