Fix reusal of va_list

xchellx · Aug 29, 2022 · 6ece227 · 6ece227
1 parent 443cd53
commit 6ece227
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/csprintf_s.h b/src/csprintf_s.h
@@ -29,16 +29,23 @@
 #include <stdio.h>
 
 char* csprintf_s(char* format, ...) {
-    va_list args;
-    va_start(args, format);
-
-    int buffSz = vsnprintf(NULL, 0, format, args);
-
-    char* buff = (char*) malloc(buffSz + 1);
-    vsnprintf(buff, buffSz + 1, format, args);
-
-    va_end(args);
-
-    return buff;
+    if (format != NULL) {
+        va_list args;
+
+        va_start(args, format);
+        int buffSz = vsnprintf(NULL, 0, format, args);
+        va_end(args);
+
+        char* buff = (char*) malloc(buffSz + 1);
+        if (buff != NULL) {
+            va_start(args, format);
+            vsnprintf(buff, buffSz + 1, format, args);
+            va_end(args);
+
+            return buff;
+        } else
+            return NULL;
+    } else
+        return NULL;
 }
 #endif