[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-6-ge13c463

[Simon McVittie]

The following commit has been merged in the debian branch:
commit e13c463ab358ca5522e864c26e8001f41902b68c
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 12 23:18:01 2010 +0100

    from ioquake3 bug 3756, which just uses the OS's memcpy()
    * Apply patch from ioquake3 bug 4331 to fix invalid use of strcpy (Closes: #583939)

diff --git a/debian/changelog b/debian/changelog
index 33532ab..f25cb44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
   * Set source format to 3.0 (quilt)
   * Separate out patches from previous versions into debian/patches
   * Replace the patch for Bug #382121 with a more complete upstream fix
-    from ioquake3, which just uses the OS's memcpy()
+    from ioquake3 bug 3756, which just uses the OS's memcpy()
+  * Apply patch from ioquake3 bug 4331 to fix invalid use of strcpy
+    (Closes: #583939)
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/patches/0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch b/debian/patches/0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch
new file mode 100644
index 0000000..45332f6
--- /dev/null
+++ b/debian/patches/0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch
@@ -0,0 +1,49 @@
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Date: Mon, 12 Jul 2010 23:16:02 +0100
+Subject: [PATCH] fix abuse of strcpy (overlapping source and dest)
+
+Reviewed-by: Ludwig Nussel
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Bug-Debian: http://bugs.debian.org/583939
+Bug-Fedora: http://bugzilla.redhat.com/show_bug.cgi?id=526338
+---
+ src/botlib/l_precomp.c |    2 +-
+ src/botlib/l_script.c  |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/botlib/l_precomp.c b/src/botlib/l_precomp.c
+index 5a0acac..1bd1e0d 100644
+--- a/src/botlib/l_precomp.c
++++ b/src/botlib/l_precomp.c
+@@ -952,7 +952,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/src/botlib/l_script.c b/src/botlib/l_script.c
+index 485254f..7b2e2ad 100644
+--- a/src/botlib/l_script.c
++++ b/src/botlib/l_script.c
+@@ -1119,7 +1119,7 @@ void StripDoubleQuotes(char *string)
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1136,7 +1136,7 @@ void StripSingleQuotes(char *string)
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index bd7b300..a6d7705 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Don-t-build-q3lcc.patch
 0004-Use-USER-as-default-player-name.patch
 0005-Fix-unaligned-access-issue.patch
+0006-fix-abuse-of-strcpy-overlapping-source-and-dest.patch

-- 
team based FPS game - packaging