cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid iterator access in wxTaskBarButton

Browse Source 
Iterators are invalid after they are deleted. Store the value before
deleting.

Reuse code of RemoveThumbBarButton.

Closes https://github.com/wxWidgets/wxWidgets/pull/1240
This commit is contained in:
Maarten Bent 2019-02-24 20:18:53 +01:00 committed by Vadim Zeitlin
parent 5c5f4eb32e
commit ceee8d554a
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/taskbarbutton.cpp
View File

@ -882,20 +882,7 @@ bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos,
wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(
wxThumbBarButton *button)
{
for ( wxThumbBarButtons::iterator iter = m_thumbBarButtons.begin();
iter != m_thumbBarButtons.end();
++iter )
{
if ( button == *iter )
{
m_thumbBarButtons.erase(iter);
button->SetParent(NULL);
InitOrUpdateThumbBarButtons();
return *iter;
}
}
return NULL;
return RemoveThumbBarButton(button->GetID());
}
wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
@ -904,12 +891,13 @@ wxThumbBarButton* wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
iter != m_thumbBarButtons.end();
++iter )
{
if ( id == (*iter)->GetID() )
wxThumbBarButton* button = *iter;
if ( id == button->GetID() )
{
m_thumbBarButtons.erase(iter);
(*iter)->SetParent(NULL);
button->SetParent(NULL);
InitOrUpdateThumbBarButtons();
return *iter;
return button;
}
}
@ -1391,10 +1379,11 @@ wxTaskBarJumpListImpl::RemoveCustomCategory(const wxString& title)
it != m_customCategories.end();
++it )
{
if ( (*it)->GetTitle() == title )
wxTaskBarJumpListCategory* tbJlCat = *it;
if ( tbJlCat->GetTitle() == title )
{
m_customCategories.erase(it);
return *it;
return tbJlCat;
}
}