diff options
| author | Simon Howard | 2010-05-01 21:47:26 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-05-01 21:47:26 +0000 |
| commit | 6787e90da50f6954d80512d172a985af4a6fc299 (patch) | |
| tree | b40fa2753430cb6465c2a4c8393cc0d7f6b62722 | |
| parent | da43e27597e40f5a298ed5c4ae785cc1b36510d4 (diff) | |
| download | chocolate-doom-6787e90da50f6954d80512d172a985af4a6fc299.tar.gz chocolate-doom-6787e90da50f6954d80512d172a985af4a6fc299.tar.bz2 chocolate-doom-6787e90da50f6954d80512d172a985af4a6fc299.zip | |
Further sanity checking on use of strcpy() with dehacked string
replacements.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1928
| -rw-r--r-- | src/net_client.c | 3 | ||||
| -rw-r--r-- | src/wi_stuff.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/net_client.c b/src/net_client.c index 0d6dd2fc..322869d7 100644 --- a/src/net_client.c +++ b/src/net_client.c @@ -193,7 +193,8 @@ static void NET_CL_PlayerQuitGame(player_t *player) // Do this the same way as Vanilla Doom does, to allow dehacked // replacements of this message - strcpy(exitmsg, DEH_String("Player 1 left the game")); + strncpy(exitmsg, DEH_String("Player 1 left the game"), sizeof(exitmsg)); + exitmsg[sizeof(exitmsg) - 1] = '\0'; exitmsg[7] += player - players; diff --git a/src/wi_stuff.c b/src/wi_stuff.c index e7eece07..e8fcab42 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -1749,11 +1749,13 @@ void WI_loadData(void) if (gamemode == commercial) { - strcpy(bg_lumpname, DEH_String("INTERPIC")); + strncpy(bg_lumpname, 9, DEH_String("INTERPIC")); + bg_lumpname[8] = '\0'; } else if (gamemode == retail && wbs->epsd == 3) { - strcpy(bg_lumpname, DEH_String("INTERPIC")); + strncpy(bg_lumpname, 9, DEH_String("INTERPIC")); + bg_lumpname[8] = '\0'; } else { |