From 8eb3200286d523379295143ce3f44d77ce036d4b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 1 Apr 2014 20:43:45 -0400
Subject: Replace all snprintf() calls with M_snprintf().

The Windows API has an _snprintf function that is not the same as
Unix's snprintf(): if the string is truncated then no trailing NUL
character is appended. This makes the function unsafe. Define a
replacement/wrapper called M_snprintf that works the same but always
appends a trailing NUL, for safety on Windows and other OSes that
behave like this.

Do the same thing for vsnprintf(), and update HACKING to list
snprintf/vsnprintf as forbidden functions. This fixes #375;
thanks to Quasar for pointing out the different behavior of these
functions.
---
 src/strife/m_saves.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/strife/m_saves.c')

diff --git a/src/strife/m_saves.c b/src/strife/m_saves.c
index 4303dbe2..e4d5919f 100644
--- a/src/strife/m_saves.c
+++ b/src/strife/m_saves.c
@@ -222,7 +222,7 @@ void M_SaveMoveMapToHere(void)
     char tmpnum[33];
 
     // haleyjd: no itoa available...
-    snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
+    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
 
     // haleyjd: use M_SafeFilePath, not sprintf
     mapsave  = M_SafeFilePath(savepath, tmpnum);
@@ -251,7 +251,7 @@ void M_SaveMoveHereToMap(void)
     char tmpnum[33];
 
     // haleyjd: no itoa available...
-    snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
+    M_snprintf(tmpnum, sizeof(tmpnum), "%d", gamemap);
 
     mapsave  = M_SafeFilePath(savepathtemp, tmpnum);
     heresave = M_SafeFilePath(savepathtemp, "here");
@@ -437,7 +437,7 @@ char *M_SafeFilePath(const char *basepath, const char *newcomponent)
     // that either basepath or newcomponent includes a redundant slash at the
     // end or beginning respectively.
     newstrlen = M_StringAlloc(&newstr, 3, 1, basepath, "/", newcomponent);
-    snprintf(newstr, newstrlen, "%s/%s", basepath, newcomponent);
+    M_snprintf(newstr, newstrlen, "%s/%s", basepath, newcomponent);
     M_NormalizeSlashes(newstr);
 
     return newstr;
@@ -477,8 +477,8 @@ char *M_MakeStrifeSaveDir(int slotnum, const char *extra)
 {
     static char tmpbuffer[32];
 
-    snprintf(tmpbuffer, sizeof(tmpbuffer),
-             "strfsav%d.ssg%s", slotnum, extra);
+    M_snprintf(tmpbuffer, sizeof(tmpbuffer),
+               "strfsav%d.ssg%s", slotnum, extra);
 
     return tmpbuffer;
 }
-- 
cgit v1.2.3