From bd36daa39559da8278825c9983c42ef84c942fdf Mon Sep 17 00:00:00 2001
From: jcm <butt@butts.com>
Date: Thu, 6 Jun 2024 14:59:55 -0500
Subject: [PATCH] UI: Address logging buffer size discrepancies

---
 UI/obs-app.cpp     | 5 +++--
 UI/qt-wrappers.cpp | 2 +-
 libobs/util/base.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 389f7df52..9c5a6c31c 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -350,7 +350,7 @@ static inline bool too_many_repeated_entries(fstream &logFile, const char *msg,
 	static mutex log_mutex;
 	static const char *last_msg_ptr = nullptr;
 	static int last_char_sum = 0;
-	static char cmp_str[4096];
+	static char cmp_str[8192];
 	static int rep_count = 0;
 
 	int new_sum = sum_chars(output_str);
@@ -376,7 +376,8 @@ static inline bool too_many_repeated_entries(fstream &logFile, const char *msg,
 	}
 
 	last_msg_ptr = msg;
-	strcpy(cmp_str, output_str);
+	strncpy(cmp_str, output_str, sizeof(cmp_str));
+	cmp_str[sizeof(cmp_str) - 1] = 0;
 	last_char_sum = new_sum;
 	rep_count = 0;
 
diff --git a/UI/qt-wrappers.cpp b/UI/qt-wrappers.cpp
index 51c062b5a..c91fab5fa 100644
--- a/UI/qt-wrappers.cpp
+++ b/UI/qt-wrappers.cpp
@@ -42,7 +42,7 @@
 
 static inline void OBSErrorBoxva(QWidget *parent, const char *msg, va_list args)
 {
-	char full_message[4096];
+	char full_message[8192];
 	vsnprintf(full_message, sizeof(full_message), msg, args);
 
 	QMessageBox::critical(parent, "Error", full_message);
diff --git a/libobs/util/base.c b/libobs/util/base.c
index 831ad47cd..1800727b1 100644
--- a/libobs/util/base.c
+++ b/libobs/util/base.c
@@ -27,7 +27,7 @@ static void *crash_param = NULL;
 static void def_log_handler(int log_level, const char *format, va_list args,
 			    void *param)
 {
-	char out[4096];
+	char out[8192];
 	vsnprintf(out, sizeof(out), format, args);
 
 	switch (log_level) {