encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assert: Check for integer overflow. 

Move rendering of the assert message into a separate
function so we can remove the ugly loop construction.

Changes the logic such that allocation failure no longer
immediately returns SDL_ASSERTION_ABORT, instead we
fall back to the truncated message.

If an error is indicated from SDL_snprintf, then we do
abort with SDL_ASSERTION_ABORT.
This commit is contained in:
Eddy Jansson 2022-05-11 19:39:30 +02:00 committed by Sam Lantinga
parent 737b4fc32c
commit d7866ffac8
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/SDL_assert.c
View File

@ -90,6 +90,20 @@ static void SDL_AddAssertionToReport(SDL_assert_data *data)
} }
} }
#ifdef __WIN32__
#define ENDLINE "\r\n"
#else
#define ENDLINE "\n"
#endif
static int SDL_RenderAssertMessage(char *buf, size_t buf_len, const SDL_assert_data *data) {
return SDL_snprintf(buf, buf_len,
"Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE " '%s'",
data->function, data->filename, data->linenum,
data->trigger_count, (data->trigger_count == 1) ? "time" : "times",
data->condition
);
}
static void SDL_GenerateAssertionReport(void) static void SDL_GenerateAssertionReport(void)
{ {
@ -139,16 +153,9 @@ static SDL_NORETURN void SDL_AbortAssertion(void)
SDL_ExitProcess(42); SDL_ExitProcess(42);
} }
static SDL_assert_state SDLCALL static SDL_assert_state SDLCALL
SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
{ {
#ifdef __WIN32__
#define ENDLINE "\r\n"
#else
#define ENDLINE "\n"
#endif
const char *envr; const char *envr;
SDL_assert_state state = SDL_ASSERTION_ABORT; SDL_assert_state state = SDL_ASSERTION_ABORT;
SDL_Window *window; SDL_Window *window;
@ -167,29 +174,32 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
char stack_buf[SDL_MAX_ASSERT_MESSAGE_STACK]; char stack_buf[SDL_MAX_ASSERT_MESSAGE_STACK];
char *message = stack_buf; char *message = stack_buf;
size_t buf_len = sizeof(stack_buf); size_t buf_len = sizeof(stack_buf);
size_t len; int len;
(void) userdata; /* unused in default handler. */ (void) userdata; /* unused in default handler. */
do { /* Assume the output will fit... */
/* Assume the output will fit... */ len = SDL_RenderAssertMessage(message, buf_len, data);
len = SDL_snprintf(message, buf_len,
"Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE " '%s'",
data->function, data->filename, data->linenum,
data->trigger_count, (data->trigger_count == 1) ? "time" : "times",
data->condition);
/* .. and if it didn't, allocate as much room as we actually need. */ /* .. and if it didn't, try to allocate as much room as we actually need. */
if (len >= buf_len && message == stack_buf) { if (len >= buf_len) {
buf_len = len + 1; if (SDL_size_add_overflow(len, 1, &buf_len) == 0) {
message = (char *)SDL_malloc(buf_len); message = (char *)SDL_malloc(buf_len);
if (!message) { if (message) {
/* Uh oh, we're in real trouble now... */ len = SDL_RenderAssertMessage(message, buf_len, data);
return SDL_ASSERTION_ABORT; } else {
message = stack_buf;
} }
len = 0;
} }
} while (len == 0); }
/* Something went very wrong */
if (len < 0) {
if (message != stack_buf) {
SDL_free(message);
}
return SDL_ASSERTION_ABORT;
}
debug_print("\n\n%s\n\n", message); debug_print("\n\n%s\n\n", message);