From 455ffec1e4c2c3d7981d0b42534b2fa3b195d5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= <gustaf@hanicef.me>
Date: Mon, 7 Oct 2024 15:48:42 +0200
Subject: [PATCH] Check for empty string before printing in console
---
src/dedicated/i_system.c | 5 ++++-
src/sdl/i_system.c | 22 +++++++++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c
index 29a3e9511d..e95ea3417b 100644
--- a/src/dedicated/i_system.c
+++ b/src/dedicated/i_system.c
@@ -1035,6 +1035,9 @@ void I_OutputMsg(const char *fmt, ...)
va_start(argptr,fmt);
len = vsnprintf(NULL, 0, fmt, argptr);
va_end(argptr);
+ if (len == 0)
+ return;
+
txt = malloc(len+1);
va_start(argptr,fmt);
vsprintf(txt, fmt, argptr);
@@ -1134,7 +1137,7 @@ void I_OutputMsg(const char *fmt, ...)
if (!framebuffer)
fprintf(stderr, "%s", txt);
#ifdef HAVE_TERMIOS
- if (consolevent && txt[strlen(txt)-1] == '\n')
+ if (consolevent && txt[len-1] == '\n')
{
write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
ttycon_ateol = true;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 8227cd52ce..3eb70373b2 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -840,9 +840,16 @@ static void I_RegisterChildSignals(void)
void I_OutputMsg(const char *fmt, ...)
{
size_t len;
- char txt[8192];
+ char *txt;
va_list argptr;
+ va_start(argptr,fmt);
+ len = vsnprintf(NULL, 0, fmt, argptr);
+ va_end(argptr);
+ if (len == 0)
+ return;
+
+ txt = malloc(len+1);
va_start(argptr,fmt);
vsprintf(txt, fmt, argptr);
va_end(argptr);
@@ -876,7 +883,10 @@ void I_OutputMsg(const char *fmt, ...)
DWORD bytesWritten;
if (co == INVALID_HANDLE_VALUE)
+ {
+ free(txt);
return;
+ }
if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten))
{
@@ -892,11 +902,16 @@ void I_OutputMsg(const char *fmt, ...)
if (oldLength > 0)
{
LPVOID blank = malloc(oldLength);
- if (!blank) return;
+ if (!blank)
+ {
+ free(txt);
+ return;
+ }
memset(blank, ' ', oldLength); // Blank out.
oldLines = malloc(oldLength*sizeof(TCHAR));
if (!oldLines)
{
+ free(txt);
free(blank);
return;
}
@@ -941,7 +956,7 @@ void I_OutputMsg(const char *fmt, ...)
if (!framebuffer)
fprintf(stderr, "%s", txt);
#ifdef HAVE_TERMIOS
- if (consolevent && txt[strlen(txt)-1] == '\n')
+ if (consolevent && txt[len-1] == '\n')
{
write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
ttycon_ateol = true;
@@ -953,6 +968,7 @@ void I_OutputMsg(const char *fmt, ...)
fflush(stderr);
#endif
+ free(txt);
}
//
--
GitLab