ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-22 20:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report out of memory instead of crashing in SDL_LoadFile_RW()

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/8935

(cherry picked from commit 52975961326797558d1c66a02cb32870ff7be6d4)
This commit is contained in:
Sam Lantinga 2024-01-27 12:15:43 -08:00
parent 55caed2011
commit aac7d1c2ae
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/file/SDL_rwops.c
View file

@ -718,12 +718,12 @@ void *SDL_LoadFile_RW(SDL_RWops *src, size_t *datasize, int freesrc)
{ {
static const Sint64 FILE_CHUNK_SIZE = 1024; static const Sint64 FILE_CHUNK_SIZE = 1024;
Sint64 size; Sint64 size;
size_t size_read, size_total; size_t size_read, size_total = 0;
void *data = NULL, *newdata; void *data = NULL, *newdata;
if (!src) { if (!src) {
SDL_InvalidParamError("src"); SDL_InvalidParamError("src");
return NULL; goto done;
} }
size = SDL_RWsize(src); size = SDL_RWsize(src);
@ -731,8 +731,11 @@ void *SDL_LoadFile_RW(SDL_RWops *src, size_t *datasize, int freesrc)
size = FILE_CHUNK_SIZE; size = FILE_CHUNK_SIZE;
} }
data = SDL_malloc((size_t)(size + 1)); data = SDL_malloc((size_t)(size + 1));
if (!data) {
SDL_OutOfMemory();
goto done;
}
size_total = 0;
for (;;) { for (;;) {
if ((((Sint64)size_total) + FILE_CHUNK_SIZE) > size) { if ((((Sint64)size_total) + FILE_CHUNK_SIZE) > size) {
size = (size_total + FILE_CHUNK_SIZE); size = (size_total + FILE_CHUNK_SIZE);
@ -753,12 +756,12 @@ void *SDL_LoadFile_RW(SDL_RWops *src, size_t *datasize, int freesrc)
size_total += size_read; size_total += size_read;
} }
if (datasize) {
*datasize = size_total;
}
((char *)data)[size_total] = '\0'; ((char *)data)[size_total] = '\0';
done: done:
if (datasize) {
*datasize = size_total;
}
if (freesrc && src) { if (freesrc && src) {
SDL_RWclose(src); SDL_RWclose(src);
} }