From 7afcf656bd25e2ed6b33bae1cbbc4a62d66e1938 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 2 Jun 2022 13:59:33 +0200
Subject: Added hyprctl devices

---
 src/helpers/MiscFunctions.cpp | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'src/helpers/MiscFunctions.cpp')

diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 6c53b8f2..7a947832 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -46,16 +46,35 @@ void wlr_signal_emit_safe(struct wl_signal *signal, void *data) {
 }
 
 std::string getFormat(const char *fmt, ...) {
-    char buf[2048] = "";
+    char buf[LOGMESSAGESIZE] = "";
+    char* outputStr;
+    int logLen;
 
     va_list args;
     va_start(args, fmt);
+    logLen = vsnprintf(buf, sizeof buf, fmt, args);
+    va_end(args);
 
-    vsprintf(buf, fmt, args);
+    if ((long unsigned int)logLen < sizeof buf) {
+        outputStr = strdup(buf);
+    } else {
+        outputStr = (char*)malloc(logLen + 1);
 
-    va_end(args);
+        if (!outputStr) {
+            printf("CRITICAL: Cannot alloc size %d for log! (Out of memory?)", logLen + 1);
+            return "";
+        }
+
+        va_start(args, fmt);
+        vsnprintf(outputStr, logLen + 1U, fmt, args);
+        va_end(args);
+    }
+
+    std::string output = std::string(outputStr);
+
+    free(outputStr);
 
-    return std::string(buf);
+    return output;
 }
 
 void scaleBox(wlr_box* box, float scale) {
-- 
cgit v1.2.3