From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 2 Jun 2005 11:42:18 +0000 (+0000)
Subject: fix some potential buffer overflows
X-Git-Tag: xonotic-v0.1.0preview~4805
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c6deef2a013d5fb3d7a807874e76f6256b28b8a;p=xonotic%2Fdarkplaces.git

fix some potential buffer overflows


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5377 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_screen.c b/cl_screen.c
index 7ccced75..650c64dc 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -324,25 +324,25 @@ void R_TimeReport(char *desc)
 	r_timereport_current = Sys_DoubleTime();
 	t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0);
 
-	sprintf(tempbuf, "%8i %s", t, desc);
+	dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %s", t, desc);
 	length = strlen(tempbuf);
 	while (length < 20)
 		tempbuf[length++] = ' ';
 	tempbuf[length] = 0;
 	if (speedstringcount + length > (vid_conwidth.integer / 8))
 	{
-		strcat(r_speeds_string, "\n");
+		strlcat(r_speeds_string, "\n", sizeof(r_speeds_string));
 		speedstringcount = 0;
 	}
 	// skip the space at the beginning if it's the first on the line
 	if (speedstringcount == 0)
 	{
-		strcat(r_speeds_string, tempbuf + 1);
+		strlcat(r_speeds_string, tempbuf + 1, sizeof(r_speeds_string));
 		speedstringcount = length - 1;
 	}
 	else
 	{
-		strcat(r_speeds_string, tempbuf);
+		strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string));
 		speedstringcount += length;
 	}
 }
diff --git a/gl_draw.c b/gl_draw.c
index 135cac69..fc19b76f 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -292,7 +292,7 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	if (numcachepics == MAX_CACHED_PICS)
 		Sys_Error ("numcachepics == MAX_CACHED_PICS");
 	pic = cachepics + (numcachepics++);
-	strcpy (pic->name, path);
+	strlcpy (pic->name, path, sizeof(pic->name));
 	// link into list
 	pic->chain = cachepichash[hashkey];
 	cachepichash[hashkey] = pic;