shithub: choc

Download patch

ref: 6787e90da50f6954d80512d172a985af4a6fc299
parent: da43e27597e40f5a298ed5c4ae785cc1b36510d4
author: Simon Howard <fraggle@gmail.com>
date: Sat May 1 17:47:26 EDT 2010 

Further sanity checking on use of strcpy() with dehacked string
replacements.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1928


--- a/src/net_client.c
+++ b/src/net_client.c
@@ -193,7 +193,8 @@
     // 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;
 
--- a/src/wi_stuff.c
+++ b/src/wi_stuff.c
@@ -1749,11 +1749,13 @@
 
     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
     {