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

Dont allow to remove from wxImageList an images with index out of range

Browse Source 
Since ImageList_Remove() accepts -1 index as a magic number to remove all
images, we need to explicitly prevent using indices < 0 in the call.
Because wxImageList::RemoveAll() uses the trick with -1 index
to call wxImageList::Remove(-1) we also need to refactor this mehod and
call ImageList_Remove() API directly instead.
This commit is contained in:
Artur Wieczorek 2021-04-04 21:01:43 +02:00
parent 882f0a4631
commit 51ff4ec08b
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/msw/imaglist.cpp
View File

@ -323,7 +323,7 @@ bool wxImageList::Replace(int i, const wxIcon& icon)
// Removes the image at the given index.
bool wxImageList::Remove(int index)
{
bool ok = ImageList_Remove(GetHImageList(), index) != 0;
bool ok = index >= 0 && ImageList_Remove(GetHImageList(), index) != FALSE;
if ( !ok )
{
wxLogLastError(wxT("ImageList_Remove()"));
@ -336,7 +336,13 @@ bool wxImageList::Remove(int index)
bool wxImageList::RemoveAll()
{
// don't use ImageList_RemoveAll() because mingw32 headers don't have it
return Remove(-1);
bool ok = ImageList_Remove(GetHImageList(), -1) != FALSE;
if ( !ok )
{
wxLogLastError(wxT("ImageList_Remove()"));
}
return ok;
}
// Draws the given image on a dc at the specified position.