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

Handle out of memory errors without any allocation

Browse Source
This commit is contained in:
Sam Lantinga
2023-12-01 09:05:04 -08:00
parent 579681a372
commit 66e532fa61
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/SDL_error.c
View File

@@ -32,7 +32,7 @@ int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
int result; int result;
SDL_error *error = SDL_GetErrBuf(); SDL_error *error = SDL_GetErrBuf();
error->error = 1; /* mark error as valid */ error->error = SDL_ErrorCodeGeneric;
va_start(ap, fmt); va_start(ap, fmt);
result = SDL_vsnprintf(error->str, error->len, fmt, ap); result = SDL_vsnprintf(error->str, error->len, fmt, ap);
@@ -63,12 +63,20 @@ int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
const char *SDL_GetError(void) const char *SDL_GetError(void)
{ {
const SDL_error *error = SDL_GetErrBuf(); const SDL_error *error = SDL_GetErrBuf();
return error->error ? error->str : "";
switch (error->error) {
case SDL_ErrorCodeGeneric:
return error->str;
case SDL_ErrorCodeOutOfMemory:
return "Out of memory";
default:
return "";
}
} }
void SDL_ClearError(void) void SDL_ClearError(void)
{ {
SDL_GetErrBuf()->error = 0; SDL_GetErrBuf()->error = SDL_ErrorCodeNone;
} }
/* Very common errors go here */ /* Very common errors go here */
@@ -76,7 +84,8 @@ int SDL_Error(SDL_errorcode code)
{ {
switch (code) { switch (code) {
case SDL_ENOMEM: case SDL_ENOMEM:
return SDL_SetError("Out of memory"); SDL_GetErrBuf()->error = SDL_ErrorCodeOutOfMemory;
return -1;
case SDL_EFREAD: case SDL_EFREAD:
return SDL_SetError("Error reading from datastream"); return SDL_SetError("Error reading from datastream");
case SDL_EFWRITE: case SDL_EFWRITE:
@@ -92,13 +101,6 @@ int SDL_Error(SDL_errorcode code)
char *SDL_GetErrorMsg(char *errstr, int maxlen) char *SDL_GetErrorMsg(char *errstr, int maxlen)
{ {
const SDL_error *error = SDL_GetErrBuf(); SDL_strlcpy(errstr, SDL_GetError(), maxlen);
if (error->error) {
SDL_strlcpy(errstr, error->str, maxlen);
} else {
*errstr = '\0';
}
return errstr; return errstr;
} }

9
src/SDL_error_c.h
View File

@@ -27,9 +27,16 @@
#ifndef SDL_error_c_h_ #ifndef SDL_error_c_h_
#define SDL_error_c_h_ #define SDL_error_c_h_
typedef enum
{
SDL_ErrorCodeNone,
SDL_ErrorCodeGeneric,
SDL_ErrorCodeOutOfMemory,
} SDL_ErrorCode;
typedef struct SDL_error typedef struct SDL_error
{ {
int error; /* This is a numeric value corresponding to the current error */ SDL_ErrorCode error;
char *str; char *str;
size_t len; size_t len;
SDL_realloc_func realloc_func; SDL_realloc_func realloc_func;