mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-04 08:56:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't free properties while modifying the property hashtable

Browse Source 
A property cleanup callback might end up trying to set other properties, so we don't want to have a lock held at that point.

Fixes an assertion in testprocess when cleaning up IO stream properties
This commit is contained in:
Sam Lantinga
2024-12-12 14:09:09 -08:00
parent 43a61fec91
commit ce9dddfde2
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/SDL_properties.c
View File

@@ -81,9 +81,8 @@ static void SDL_FreeProperty(const void *key, const void *value, void *data)
SDL_FreePropertyWithCleanup(key, value, data, true); SDL_FreePropertyWithCleanup(key, value, data, true);
} }
static void SDL_FreeProperties(const void *key, const void *value, void *data) static void SDL_FreeProperties(SDL_Properties *properties)
{ {
SDL_Properties *properties = (SDL_Properties *)value;
if (properties) { if (properties) {
if (properties->props) { if (properties->props) {
SDL_DestroyHashTable(properties->props); SDL_DestroyHashTable(properties->props);
@@ -103,7 +102,7 @@ bool SDL_InitProperties(void)
return true; return true;
} }
SDL_properties = SDL_CreateHashTable(NULL, 16, SDL_HashID, SDL_KeyMatchID, SDL_FreeProperties, true, false); SDL_properties = SDL_CreateHashTable(NULL, 16, SDL_HashID, SDL_KeyMatchID, NULL, true, false);
if (!SDL_properties) { if (!SDL_properties) {
goto error; goto error;
} }
@@ -133,6 +132,13 @@ void SDL_QuitProperties(void)
} }
if (SDL_properties) { if (SDL_properties) {
void *iter;
const void *key, *value;
iter = NULL;
while (SDL_IterateHashTable(SDL_properties, &key, &value, &iter)) {
SDL_FreeProperties((SDL_Properties *)value);
}
SDL_DestroyHashTable(SDL_properties); SDL_DestroyHashTable(SDL_properties);
SDL_properties = NULL; SDL_properties = NULL;
} }
@@ -200,7 +206,7 @@ SDL_PropertiesID SDL_CreateProperties(void)
} }
error: error:
SDL_FreeProperties(NULL, properties, NULL); SDL_FreeProperties(properties);
return 0; return 0;
} }
@@ -790,9 +796,14 @@ bool SDL_DumpProperties(SDL_PropertiesID props)
void SDL_DestroyProperties(SDL_PropertiesID props) void SDL_DestroyProperties(SDL_PropertiesID props)
{ {
SDL_Properties *properties = NULL;
if (!props) { if (!props) {
return; return;
} }
SDL_RemoveFromHashTable(SDL_properties, (const void *)(uintptr_t)props); if (SDL_FindInHashTable(SDL_properties, (const void *)(uintptr_t)props, (const void **)&properties)) {
SDL_FreeProperties(properties);
SDL_RemoveFromHashTable(SDL_properties, (const void *)(uintptr_t)props);
}
} }