ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 10:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: Use malloc for long messages.

Browse source 
For short messages, use a stack buffer that is
significantly smaller than SDL_MAX_LOG_MESSAGE.

The rationale for this is that we don't want to risk
blowing the stack, while at the same time we would
like to not put pressure on the memory allocator unless
absolutely necessary.
This commit is contained in:
Eddy Jansson 2022-04-29 14:06:05 +02:00 committed by Sam Lantinga
parent 73448fe245
commit 645db217a0
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/SDL_log.c
View file

@ -39,6 +39,9 @@
#include <android/log.h>
#endif
/* The size of the stack buffer to use for rendering log messages. */
#define SDL_MAX_LOG_MESSAGE_STACK 256
#define DEFAULT_PRIORITY SDL_LOG_PRIORITY_CRITICAL
#define DEFAULT_ASSERT_PRIORITY SDL_LOG_PRIORITY_WARN
#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO
@ -285,8 +288,10 @@ GetCategoryPrefix(int category)
void
SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
{
static char message[SDL_MAX_LOG_MESSAGE];
char *message = NULL;
char stack_buf[SDL_MAX_LOG_MESSAGE_STACK];
size_t len;
va_list aq;
/* Nothing to do if we don't have an output function */
if (!SDL_log_function) {
@ -308,14 +313,24 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
log_function_mutex = SDL_CreateMutex();
}
if (log_function_mutex) {
SDL_LockMutex(log_function_mutex);
/* Render into stack buffer */
va_copy(aq, ap);
len = SDL_vsnprintf(stack_buf, sizeof(stack_buf), fmt, aq);
va_end(aq);
/* If message truncated, allocate and re-render */
if (len >= sizeof(stack_buf)) {
message = (char *)SDL_malloc(SDL_MAX_LOG_MESSAGE);
if (!message)
return;
va_copy(aq, ap);
len = SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, aq);
va_end(aq);
} else {
message = stack_buf;
}
SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
/* Chop off final endline. */
len = SDL_strlen(message);
if ((len > 0) && (message[len-1] == '\n')) {
message[--len] = '\0';
if ((len > 0) && (message[len-1] == '\r')) { /* catch "\r\n", too. */
@ -323,11 +338,20 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
}
}
if (log_function_mutex) {
SDL_LockMutex(log_function_mutex);
}
SDL_log_function(SDL_log_userdata, category, priority, message);
if (log_function_mutex) {
SDL_UnlockMutex(log_function_mutex);
}
/* Free only if dynamically allocated */
if (message != stack_buf) {
SDL_free(message);
}
}
#if defined(__WIN32__) && !defined(HAVE_STDIO_H) && !defined(__WINRT__)