mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-30 06:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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/sensor/SDL_sensor.c
View File

@@ -246,11 +246,11 @@ const char *SDL_GetSensorNameForID(SDL_SensorID instance_id)
SDL_LockSensors();
if (SDL_GetDriverAndSensorIndex(instance_id, &driver, &device_index)) {
name = driver->GetDeviceName(device_index);
name = SDL_CreateTemporaryString(driver->GetDeviceName(device_index));
}
SDL_UnlockSensors();
return name ? SDL_FreeLater(SDL_strdup(name)) : NULL;
return name;
}
SDL_SensorType SDL_GetSensorTypeForID(SDL_SensorID instance_id)
@@ -407,7 +407,7 @@ const char *SDL_GetSensorName(SDL_Sensor *sensor)
{
CHECK_SENSOR_MAGIC(sensor, NULL);
retval = sensor->name;
retval = SDL_CreateTemporaryString(sensor->name);
}
SDL_UnlockSensors();
@@ -526,7 +526,7 @@ void SDL_CloseSensor(SDL_Sensor *sensor)
}
/* Free the data associated with this sensor */
SDL_FreeLater(sensor->name); // this pointer gets handed to the app by SDL_GetSensorName().
SDL_free(sensor->name);
SDL_free(sensor);
}
SDL_UnlockSensors();