Add IWriter::VPrintf function.

OpenXRay · Dec 12, 2015 · 77ed999 · 77ed999
1 parent 91f03a8
commit 77ed999
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/xrCore/FS.cpp b/src/xrCore/FS.cpp
@@ -321,19 +321,19 @@ void IWriter::w_sdir(const Fvector& D)
     w_dir(C);
     w_float(mag);
 }
+// XXX: reimplement to prevent buffer overflows
 void IWriter::w_printf(const char* format, ...)
 {
-    va_list mark;
-    char buf[1024];
-
-    va_start(mark, format);
-#ifndef _EDITOR
-    vsprintf_s(buf, format, mark);
-#else
-    vsprintf(buf, format, mark);
-#endif
-    va_end(mark);
+    va_list args;
+    va_start(args, format);
+    VPrintf(format, args);
+    va_end(args);
+}
 
+void IWriter::VPrintf(const char *format, va_list args)
+{
+    char buf[1024];
+    std::vsnprintf(buf, sizeof(buf), format, args);
     w(buf, xr_strlen(buf));
 }
 

diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
@@ -85,6 +85,7 @@ class XRCORE_API IWriter
     IC void w_dir(const Fvector& D) { w_u16(pvCompress(D)); }
     void w_sdir(const Fvector& D);
     void __cdecl w_printf(const char* format, ...);
+    void VPrintf(const char *format, va_list args);
 
     // generalized chunking
     u32 align();