diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 04:16:11 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 04:16:11 +0000 |
commit | ded8be493ca5711484b288e2a8f2652b1720abec (patch) | |
tree | fffca0d129566e2b1de4107029a482c272620ff6 | |
parent | 55eb397c9a5bc8b21cf1f93a193632e83555eb09 (diff) | |
download | chromium_src-ded8be493ca5711484b288e2a8f2652b1720abec.zip chromium_src-ded8be493ca5711484b288e2a8f2652b1720abec.tar.gz chromium_src-ded8be493ca5711484b288e2a8f2652b1720abec.tar.bz2 |
Fix a bug that caused a crash by NULL pointer dereference.
BUG=40624
TEST=manually
Review URL: http://codereview.chromium.org/1540018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43808 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | views/controls/button/native_button_gtk.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index 1fc7fac..4a54fc5 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -245,11 +245,15 @@ void NativeRadioButtonGtk::ViewHierarchyChanged(bool is_add, "radio-button views."; continue; } - // Join the group + // Join the group, if the peer's native wrapper is present. + // A button without wrapper will be added to the group in + // its own ViewHierachyChanged. NativeButtonWrapper* wrapper = static_cast<RadioButton*>(*i)->native_wrapper(); - SetGroupFrom(wrapper); - break; + if (wrapper) { + SetGroupFrom(wrapper); + break; + } } } } |