From d122f1bf968c9e5f78560d18087bbfe769b1150f Mon Sep 17 00:00:00 2001 From: K J Date: Wed, 13 Aug 2025 14:11:13 -0400 Subject: [PATCH] fix: multiple additional buffer overruns found by Zwip-Zwap_Zapony --- src/android/i_system.c | 4 ++-- src/console.c | 4 ++-- src/sdl/i_system.cpp | 4 ++-- src/win32/win_dbg.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/android/i_system.c b/src/android/i_system.c index b20625587..102bff461 100644 --- a/src/android/i_system.c +++ b/src/android/i_system.c @@ -110,7 +110,7 @@ void I_Error(const char *error, ...) char logbuf[8192]; va_start(argptr, error); - vsprintf(logbuf, error, argptr); + vsnprintf(logbuf, 8192, error, argptr); va_end(argptr); LOGE(logbuf); @@ -166,7 +166,7 @@ void I_OutputMsg(const char *fmt, ...) char logbuf[8192]; va_start(argptr, fmt); - vsprintf(logbuf, fmt, argptr); + vsnprintf(logbuf, 8192, fmt, argptr); va_end(argptr); LOGD(logbuf); diff --git a/src/console.c b/src/console.c index a01c72062..fe91df0f3 100644 --- a/src/console.c +++ b/src/console.c @@ -1282,7 +1282,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...) txt = malloc(8192); va_start(argptr, fmt); - vsprintf(txt, fmt, argptr); + vsnprintf(txt, 8192, fmt, argptr); va_end(argptr); switch (level) @@ -1318,7 +1318,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...) txt = malloc(8192); va_start(argptr, fmt); - vsprintf(txt, fmt, argptr); + vsnprintf(txt, 8192, fmt, argptr); va_end(argptr); // Again I am lazy, oh well diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index f8f5e7aa6..3efe39b9e 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -2036,7 +2036,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...) if (errorcount > 20) { va_start(argptr, error); - vsprintf(buffer, error, argptr); + vsnprintf(buffer, 8192, error, argptr); va_end(argptr); // Implement message box with SDL_ShowSimpleMessageBox, // which should fail gracefully if it can't put a message box up @@ -2054,7 +2054,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...) // Display error message in the console before we start shutting it down va_start(argptr, error); - vsprintf(buffer, error, argptr); + vsnprintf(buffer, 8192, error, argptr); va_end(argptr); I_OutputMsg("\nI_Error(): %s\n", buffer); diff --git a/src/win32/win_dbg.c b/src/win32/win_dbg.c index 290227b09..a5d1adc3f 100644 --- a/src/win32/win_dbg.c +++ b/src/win32/win_dbg.c @@ -118,7 +118,7 @@ static VOID FPrintf(HANDLE fileHandle, LPCSTR lpFmt, ...) DWORD bytesWritten; va_start(arglist, lpFmt); - vsprintf(str, lpFmt, arglist); + vsnprintf(str, 1999, lpFmt, arglist); va_end(arglist); WriteFile(fileHandle, str, (DWORD)strlen(str), &bytesWritten, NULL);