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/d_iwad.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/d_iwad.c') diff --git a/src/d_iwad.c b/src/d_iwad.c index 508abf9d..3794164c 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -351,14 +351,14 @@ static void CheckSteamGUSPatches(void) len = strlen(install_path) + strlen(STEAM_BFG_GUS_PATCHES) + 20; patch_path = malloc(len); - snprintf(patch_path, len, "%s\\%s\\ACBASS.PAT", - install_path, STEAM_BFG_GUS_PATCHES); + M_snprintf(patch_path, len, "%s\\%s\\ACBASS.PAT", + install_path, STEAM_BFG_GUS_PATCHES); // Does acbass.pat exist? If so, then set gus_patch_path. if (M_FileExists(patch_path)) { - snprintf(patch_path, len, "%s\\%s", - install_path, STEAM_BFG_GUS_PATCHES); + M_snprintf(patch_path, len, "%s\\%s", + install_path, STEAM_BFG_GUS_PATCHES); M_SetVariable("gus_patch_path", patch_path); } -- cgit v1.2.3