eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't call the property cleanup function if setting the property fails

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/8659
This commit is contained in:
Sam Lantinga 2023-12-04 07:48:13 -08:00
parent 14380ec48a
commit 6cfce101fb
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/SDL_properties.c
View file

@ -54,13 +54,13 @@ static SDL_PropertiesID SDL_last_properties_id;
static SDL_PropertiesID SDL_global_properties; static SDL_PropertiesID SDL_global_properties;
static void SDL_FreeProperty(const void *key, const void *value, void *data) static void SDL_FreePropertyWithCleanup(const void *key, const void *value, void *data, SDL_bool cleanup)
{ {
SDL_Property *property = (SDL_Property *)value; SDL_Property *property = (SDL_Property *)value;
if (property) { if (property) {
switch (property->type) { switch (property->type) {
case SDL_PROPERTY_TYPE_POINTER: case SDL_PROPERTY_TYPE_POINTER:
if (property->cleanup) { if (property->cleanup && cleanup) {
property->cleanup(property->userdata, property->value.pointer_value); property->cleanup(property->userdata, property->value.pointer_value);
} }
break; break;
@ -78,6 +78,11 @@ static void SDL_FreeProperty(const void *key, const void *value, void *data)
SDL_free((void *)value); SDL_free((void *)value);
} }
static void SDL_FreeProperty(const void *key, const void *value, void *data)
{
SDL_FreePropertyWithCleanup(key, value, data, SDL_TRUE);
}
static void SDL_FreeProperties(const void *key, const void *value, void *data) static void SDL_FreeProperties(const void *key, const void *value, void *data)
{ {
SDL_Properties *properties = (SDL_Properties *)value; SDL_Properties *properties = (SDL_Properties *)value;
@ -228,11 +233,11 @@ static int SDL_PrivateSetProperty(SDL_PropertiesID props, const char *name, SDL_
int result = 0; int result = 0;
if (!props) { if (!props) {
SDL_FreeProperty(NULL, property, NULL); SDL_FreePropertyWithCleanup(NULL, property, NULL, SDL_FALSE);
return SDL_InvalidParamError("props"); return SDL_InvalidParamError("props");
} }
if (!name || !*name) { if (!name || !*name) {
SDL_FreeProperty(NULL, property, NULL); SDL_FreePropertyWithCleanup(NULL, property, NULL, SDL_FALSE);
return SDL_InvalidParamError("name"); return SDL_InvalidParamError("name");
} }
@ -241,7 +246,7 @@ static int SDL_PrivateSetProperty(SDL_PropertiesID props, const char *name, SDL_
SDL_UnlockMutex(SDL_properties_lock); SDL_UnlockMutex(SDL_properties_lock);
if (!properties) { if (!properties) {
SDL_FreeProperty(NULL, property, NULL); SDL_FreePropertyWithCleanup(NULL, property, NULL, SDL_FALSE);
return SDL_InvalidParamError("props"); return SDL_InvalidParamError("props");
} }
@ -251,7 +256,7 @@ static int SDL_PrivateSetProperty(SDL_PropertiesID props, const char *name, SDL_
if (property) { if (property) {
char *key = SDL_strdup(name); char *key = SDL_strdup(name);
if (!SDL_InsertIntoHashTable(properties->props, key, property)) { if (!SDL_InsertIntoHashTable(properties->props, key, property)) {
SDL_FreeProperty(key, property, NULL); SDL_FreePropertyWithCleanup(key, property, NULL, SDL_FALSE);
result = -1; result = -1;
} }
} }