perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Dereference of null pointer in FButtonGroup

This commit is contained in:
Markus Gans 2016-08-21 22:47:45 +02:00
parent bd1b9e7c90
commit f493f7d480
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fbuttongroup.cpp
View File

@ -70,6 +70,9 @@ void FButtonGroup::init()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FButtonGroup::isRadioButton(FToggleButton* button) const bool FButtonGroup::isRadioButton(FToggleButton* button) const
{ {
if ( ! button )
return false;
return bool ( strcmp ( button->getClassName() return bool ( strcmp ( button->getClassName()
, const_cast<char*>("FRadioButton") ) == 0 ); , const_cast<char*>("FRadioButton") ) == 0 );
} }
@ -333,7 +336,10 @@ void FButtonGroup::hide()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FButtonGroup::insert (FToggleButton* button) void FButtonGroup::insert (FToggleButton* button)
{ {
if ( button && button->group() ) if ( ! button )
return;
if ( button->group() )
button->group()->remove(button); button->group()->remove(button);
// setChecked the first FRadioButton // setChecked the first FRadioButton
@ -355,7 +361,7 @@ void FButtonGroup::remove (FToggleButton* button)
{ {
FButtonGroup::FButtonList::iterator iter; FButtonGroup::FButtonList::iterator iter;
if ( buttonlist.empty() ) if ( ! button || buttonlist.empty() )
return; return;
iter = buttonlist.begin(); iter = buttonlist.begin();