diff options
author | Simon Howard | 2014-04-01 20:43:45 -0400 |
---|---|---|
committer | Simon Howard | 2014-04-01 20:43:45 -0400 |
commit | 8eb3200286d523379295143ce3f44d77ce036d4b (patch) | |
tree | ac0edb56027f285425d896e12a1b14d78ad294b9 /src/heretic/am_map.c | |
parent | 565a1f08566520147a5abff5744dbcc256e5030c (diff) | |
download | chocolate-doom-8eb3200286d523379295143ce3f44d77ce036d4b.tar.gz chocolate-doom-8eb3200286d523379295143ce3f44d77ce036d4b.tar.bz2 chocolate-doom-8eb3200286d523379295143ce3f44d77ce036d4b.zip |
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.
Diffstat (limited to 'src/heretic/am_map.c')
-rw-r--r-- | src/heretic/am_map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/heretic/am_map.c b/src/heretic/am_map.c index fb2d0f72..df3932a1 100644 --- a/src/heretic/am_map.c +++ b/src/heretic/am_map.c @@ -411,7 +411,7 @@ void AM_loadPics(void) //char namebuf[9]; /* for (i=0;i<10;i++) { - snprintf(namebuf, sizeof(namebuf), "AMMNUM%d", i); + M_snprintf(namebuf, sizeof(namebuf), "AMMNUM%d", i); marknums[i] = W_CacheLumpName(namebuf, PU_STATIC); }*/ maplump = W_CacheLumpName(DEH_String("AUTOPAGE"), PU_STATIC); @@ -603,8 +603,8 @@ boolean AM_Responder(event_t * ev) } else if (key == key_map_mark) { - snprintf(buffer, sizeof(buffer), "%s %d", - AMSTR_MARKEDSPOT, markpointnum); + M_snprintf(buffer, sizeof(buffer), "%s %d", + AMSTR_MARKEDSPOT, markpointnum); plr->message = buffer; AM_addMark(); } |