File ioquake3-1.36-strcpy.diff of Package ioquake3

Overview Repositories Revisions Requests Users Attributes Meta

File ioquake3-1.36-strcpy.diff of Package ioquake3 (Revision 3c7b770e208f21c639625b8c46992665)

Currently displaying revision 3c7b770e208f21c639625b8c46992665 , Show latest

From d68705c73785a836e94cdd25d9b3c50ebef30159 Mon Sep 17 00:00:00 2001
From: ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 4 Nov 2009 18:13:05 +0000
Subject: [PATCH] fix wrong strcpy usage (#4331, patch by Andreas Bierfert)

git-svn-id: svn://svn.icculus.org/quake3/trunk@1731 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/botlib/l_precomp.c |    2 +-
 code/botlib/l_script.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
index 06dbae7..1fe7c14 100644
--- a/code/botlib/l_precomp.c
+++ b/code/botlib/l_precomp.c
@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
 		if ((*ptr == '\\' || *ptr == '/') &&
 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
 		{
-			strcpy(ptr, ptr+1);
+			memmove(ptr, ptr+1, strlen(ptr));
 		} //end if
 		else
 		{
diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c
index a579f28..2fe628d 100644
--- a/code/botlib/l_script.c
+++ b/code/botlib/l_script.c
@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
 {
 	if (*string == '\"')
 	{
-		strcpy(string, string+1);
+		memmove(string, string+1, strlen(string));
 	} //end if
 	if (string[strlen(string)-1] == '\"')
 	{
@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
 {
 	if (*string == '\'')
 	{
-		strcpy(string, string+1);
+		memmove(string, string+1, strlen(string));
 	} //end if
 	if (string[strlen(string)-1] == '\'')
 	{
-- 
1.6.4.2

Places

File ioquake3-1.36-strcpy.diff of Package ioquake3 (Revision 3c7b770e208f21c639625b8c46992665)

Places