diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-02 19:35:20 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-02 19:35:20 +0000 |
| commit | 82838f86fa8a844ea4d5b91bef894a50fc422fc3 (patch) | |
| tree | 684ff0db8bff0c091be8e6dbed2efedd73df5c51 /chrome/browser | |
| parent | 15d79e12a0831ac527dc938297c14a386dcf5f0a (diff) | |
| download | chromium_src-82838f86fa8a844ea4d5b91bef894a50fc422fc3.zip chromium_src-82838f86fa8a844ea4d5b91bef894a50fc422fc3.tar.gz chromium_src-82838f86fa8a844ea4d5b91bef894a50fc422fc3.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
Review URL: http://codereview.chromium.org/159711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/location_bar_view.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 8f9d813..6e26c9c 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -1160,8 +1160,10 @@ class LocationBarView::PageActionImageView::ImageLoadingTracker } void OnImageLoaded(SkBitmap* image, int index) { - if (image == NULL) + if (image == NULL) { + NOTREACHED(); image = new SkBitmap(); + } if (view_) view_->OnImageLoaded(image, index); delete image; |