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

Make sure we always copy the data returned using SDL_GetStringRule

Browse source 
This prevents race conditions where calling an API from one thread returns the data and it's freed by updates on another thread
This commit is contained in:
Sam Lantinga 2024-07-18 15:56:41 -07:00
parent ef884c8aa6
commit bb96320cc4
19 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/haptic/SDL_haptic.c
View file

@ -100,7 +100,7 @@ const char *SDL_GetHapticNameForID(SDL_HapticID instance_id)
if (SDL_GetHapticIndex(instance_id, &device_index)) {
name = SDL_SYS_HapticName(device_index);
}
return name ? SDL_FreeLater(SDL_strdup(name)) : NULL;
return SDL_CreateTemporaryString(name);
}
SDL_Haptic *SDL_OpenHaptic(SDL_HapticID instance_id)
@ -187,9 +187,9 @@ SDL_HapticID SDL_GetHapticID(SDL_Haptic *haptic)
const char *SDL_GetHapticName(SDL_Haptic *haptic)
{
CHECK_HAPTIC_MAGIC(haptic, 0);
CHECK_HAPTIC_MAGIC(haptic, NULL);
return haptic->name;
return SDL_CreateTemporaryString(haptic->name);
}
SDL_bool SDL_IsMouseHaptic(void)
@ -336,7 +336,7 @@ void SDL_CloseHaptic(SDL_Haptic *haptic)
}
/* Free the data associated with this device */
SDL_FreeLater(haptic->name); // this pointer is handed to the app in SDL_GetHapticName()
SDL_free(haptic->name);
SDL_free(haptic);
}