diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:58:40 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:58:40 +0000 |
| commit | 5a5b3954433e8d3121ea35ed13ec8e4cb2fa16f6 (patch) | |
| tree | 1c9eb562e8628f98c5f25868791d4e30762ca839 /chrome/browser | |
| parent | 1a37192a62bb8c6f212705c0df9c3c05bc1bf5e1 (diff) | |
| download | chromium_src-5a5b3954433e8d3121ea35ed13ec8e4cb2fa16f6.zip chromium_src-5a5b3954433e8d3121ea35ed13ec8e4cb2fa16f6.tar.gz chromium_src-5a5b3954433e8d3121ea35ed13ec8e4cb2fa16f6.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.
Review URL: http://codereview.chromium.org/159711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/location_bar_view.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 53e2804..be756fc 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -1154,6 +1154,8 @@ class LocationBarView::PageActionImageView::ImageLoadingTracker } void OnImageLoaded(SkBitmap* image, int index) { + if (image == NULL) + image = new SkBitmap(); if (view_) view_->OnImageLoaded(image, index); delete image; |