Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch to the released sip 4.18.1

Browse Source
This commit is contained in:
Robin Dunn
2016-09-21 22:39:54 -07:00
parent 5f3d20a7ac
commit b4bfb4d879
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sip/siplib/objmap.c
View File

@@ -270,9 +270,21 @@ static void add_object(sipObjectMap *om, void *addr, sipSimpleWrapper *val)
}
else
{
/* We are removing it from the map here. */
sipSetNotInMap(sw);
/*
* We are removing it from the map here. However, note
* that we first have to call the destructor before marking
* it as not being in the map, as the destructor itself
* might end up trying to remove the wrapper and its
* aliases from the map. In that case, if the wrapper is
* already marked as not in the map, the removal will just
* return early, leaving any potential aliases as stale
* entries in the map. If we later try to wrap a different
* object at the same address, we end up retrieving the
* stale alias entry from the object map, triggering a
* use-after-free when accessing its C++ object.
*/
sip_api_common_dtor(sw);
sipSetNotInMap(sw);
}
sw = next;