mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-10 20:06:27 +00:00
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:
@@ -270,7 +270,6 @@ CreateHwData(const char *path)
|
||||
SDL_calloc(1, sizeof(struct joystick_hwdata));
|
||||
if (!hw) {
|
||||
close(fd);
|
||||
SDL_OutOfMemory();
|
||||
return NULL;
|
||||
}
|
||||
hw->fd = fd;
|
||||
@@ -794,7 +793,7 @@ static int report_alloc(struct report *r, struct report_desc *rd, int repind)
|
||||
r->size);
|
||||
#endif
|
||||
if (!r->buf) {
|
||||
return SDL_OutOfMemory();
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
r->buf = NULL;
|
||||
|
Reference in New Issue
Block a user