diff options
| author | jschuh@google.com <jschuh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 22:40:14 +0000 |
|---|---|---|
| committer | jschuh@google.com <jschuh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 22:40:14 +0000 |
| commit | 706640aae5285ff0843cd038777616ca85525cce (patch) | |
| tree | 5fd5f342bc3c241d0d07642ca2ff2f16bbcfcb99 /chrome/browser/content_setting_bubble_model.cc | |
| parent | 7a3db3e89031b54abe5109a1151a643a3dee4db5 (diff) | |
| download | chromium_src-706640aae5285ff0843cd038777616ca85525cce.zip chromium_src-706640aae5285ff0843cd038777616ca85525cce.tar.gz chromium_src-706640aae5285ff0843cd038777616ca85525cce.tar.bz2 | |
Check that BlockedContents::blocked_popup_container is not NULL before using it.
BUG=53176
TEST=None.
Review URL: http://codereview.chromium.org/3204003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_bubble_model.cc')
| -rw-r--r-- | chrome/browser/content_setting_bubble_model.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc index fd0cae1..fa88c16 100644 --- a/chrome/browser/content_setting_bubble_model.cc +++ b/chrome/browser/content_setting_bubble_model.cc @@ -318,8 +318,10 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup { private: void SetPopups() { + // check for crbug.com/53176 + if (!tab_contents()->blocked_popup_container()) + return; BlockedPopupContainer::BlockedContents blocked_contents; - DCHECK(tab_contents()->blocked_popup_container()); tab_contents()->blocked_popup_container()->GetBlockedContents( &blocked_contents); for (BlockedPopupContainer::BlockedContents::const_iterator |