error: SDL's allocators now call SDL_OutOfMemory on error.

This means the allocator's caller doesn't need to use SDL_OutOfMemory directly
if the allocation fails.

This applies to the usual allocators: SDL_malloc, SDL_calloc, SDL_realloc
(all of these regardless of if the app supplied a custom allocator or we're
using system malloc() or an internal copy of dlmalloc under the hood),
SDL_aligned_alloc, SDL_small_alloc, SDL_strdup, SDL_asprintf, SDL_wcsdup...
probably others. If it returns something you can pass to SDL_free, it should
work.

The caller might still need to use SDL_OutOfMemory if something that wasn't
SDL allocated the memory: operator new in C++ code, Objective-C's alloc
message, win32 GlobalAlloc, etc.

Fixes #8642.
This commit is contained in:
Ryan C. Gordon
2023-11-30 00:14:27 -05:00
parent 70b65d4170
commit 447b508a77
197 changed files with 313 additions and 742 deletions

View File

@@ -208,8 +208,6 @@ SDL_SensorID *SDL_GetSensors(int *count)
if (count) {
*count = 0;
}
SDL_OutOfMemory();
}
}
SDL_UnlockSensors();
@@ -330,7 +328,6 @@ SDL_Sensor *SDL_OpenSensor(SDL_SensorID instance_id)
/* Create and initialize the sensor */
sensor = (SDL_Sensor *)SDL_calloc(sizeof(*sensor), 1);
if (!sensor) {
SDL_OutOfMemory();
SDL_UnlockSensors();
return NULL;
}

View File

@@ -147,7 +147,7 @@ static int SDL_ANDROID_SensorInit(void)
if (sensors_count > 0) {
SDL_sensors = (SDL_AndroidSensor *)SDL_calloc(sensors_count, sizeof(*SDL_sensors));
if (!SDL_sensors) {
return SDL_OutOfMemory();
return -1;
}
for (i = 0; i < sensors_count; ++i) {

View File

@@ -57,7 +57,7 @@ static int SDL_COREMOTION_SensorInit(void)
if (sensors_count > 0) {
SDL_sensors = (SDL_CoreMotionSensor *)SDL_calloc(sensors_count, sizeof(*SDL_sensors));
if (!SDL_sensors) {
return SDL_OutOfMemory();
return -1;
}
i = 0;
@@ -118,7 +118,7 @@ static int SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
hwdata = (struct sensor_hwdata *)SDL_calloc(1, sizeof(*hwdata));
if (hwdata == NULL) {
return SDL_OutOfMemory();
return -1;
}
sensor->hwdata = hwdata;

View File

@@ -52,7 +52,7 @@ static int SDL_VITA_SensorInit(void)
SDL_sensors = (SDL_VitaSensor *)SDL_calloc(SDL_sensors_count, sizeof(*SDL_sensors));
if (!SDL_sensors) {
return SDL_OutOfMemory();
return -1;
}
SDL_sensors[0].type = SDL_SENSOR_ACCEL;
@@ -119,7 +119,7 @@ static int SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
hwdata = (struct sensor_hwdata *)SDL_calloc(1, sizeof(*hwdata));
if (!hwdata) {
return SDL_OutOfMemory();
return -1;
}
sensor->hwdata = hwdata;

View File

@@ -296,7 +296,7 @@ static int ConnectSensor(ISensor *sensor)
SysFreeString(bstr_name);
}
if (!name) {
return SDL_OutOfMemory();
return -1;
}
SDL_LockSensors();
@@ -304,7 +304,7 @@ static int ConnectSensor(ISensor *sensor)
if (!new_sensors) {
SDL_UnlockSensors();
SDL_free(name);
return SDL_OutOfMemory();
return -1;
}
ISensor_AddRef(sensor);