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/hexen/p_acs.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/hexen/p_acs.c')
-rw-r--r-- | src/hexen/p_acs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/hexen/p_acs.c b/src/hexen/p_acs.c index a9e64517..7ae6a985 100644 --- a/src/hexen/p_acs.c +++ b/src/hexen/p_acs.c @@ -443,8 +443,8 @@ boolean P_StartACS(int number, int map, byte * args, mobj_t * activator, if (infoIndex == -1) { // Script not found //I_Error("P_StartACS: Unknown script number %d", number); - snprintf(ErrorMsg, sizeof(ErrorMsg), - "P_STARTACS ERROR: UNKNOWN SCRIPT %d", number); + M_snprintf(ErrorMsg, sizeof(ErrorMsg), + "P_STARTACS ERROR: UNKNOWN SCRIPT %d", number); P_SetMessage(&players[consoleplayer], ErrorMsg, true); } statePtr = &ACSInfo[infoIndex].state; @@ -540,8 +540,8 @@ boolean P_StartLockedACS(line_t * line, byte * args, mobj_t * mo, int side) { if (!(mo->player->keys & (1 << (lock - 1)))) { - snprintf(LockedBuffer, sizeof(LockedBuffer), - "YOU NEED THE %s\n", TextKeyMessages[lock - 1]); + M_snprintf(LockedBuffer, sizeof(LockedBuffer), + "YOU NEED THE %s\n", TextKeyMessages[lock - 1]); P_SetMessage(mo->player, LockedBuffer, true); S_StartSound(mo, SFX_DOOR_LOCKED); return false; @@ -1692,7 +1692,7 @@ static int CmdPrintNumber(void) { char tempStr[16]; - snprintf(tempStr, sizeof(tempStr), "%d", Pop()); + M_snprintf(tempStr, sizeof(tempStr), "%d", Pop()); M_StringConcat(PrintBuffer, tempStr, sizeof(PrintBuffer)); return SCRIPT_CONTINUE; } |