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/am_map.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/strife/am_map.c') diff --git a/src/strife/am_map.c b/src/strife/am_map.c index 05f8a519..b1336d20 100644 --- a/src/strife/am_map.c +++ b/src/strife/am_map.c @@ -32,6 +32,7 @@ #include "z_zone.h" #include "doomkeys.h" #include "doomdef.h" +#include "m_misc.h" #include "st_stuff.h" #include "p_local.h" #include "w_wad.h" @@ -670,8 +671,8 @@ AM_Responder } else if (key == key_map_mark) { - snprintf(buffer, sizeof(buffer), - "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum); + M_snprintf(buffer, sizeof(buffer), + "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum); plr->message = buffer; AM_addMark(); } -- cgit v1.2.3