[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-5-13-gdb9676b

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 1eb41e22f7bf4c28829484db6fbcc1096e2d6f62
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Mon Jun 7 13:35:26 2010 +0900

    Use memmove instead of strcpy for overlapping memory regions. (LP: #554748)
    
    * Use memmove instead of strcpy for overlapping memory regions.
      (LP: #554748)
      + new patch: memmove.patch

diff --git a/debian/changelog b/debian/changelog
index e53b205..fb37236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openarena (0.8.1-7) UNRELEASED; urgency=low
+
+  * Use memmove instead of strcpy for overlapping memory regions.
+    (LP: #554748)
+    + new patch: memmove.patch
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 07 Jun 2010 13:34:13 +0900
+
 openarena (0.8.1-6) unstable; urgency=low
 
   * Convert source package to format 3.0 quilt
diff --git a/debian/patches/memmove.patch b/debian/patches/memmove.patch
new file mode 100644
index 0000000..13b0d7b
--- /dev/null
+++ b/debian/patches/memmove.patch
@@ -0,0 +1,37 @@
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/554748
+Bug-Fedora: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Subject: Use memmove instead of strcpy for overlapping memory regions
+
+--- openarena.orig/code/botlib/l_precomp.c
++++ openarena/code/botlib/l_precomp.c
+@@ -948,7 +948,7 @@
+ 		if ((*ptr == '\\' || *ptr == '/') &&
+ 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ 		{
+-			strcpy(ptr, ptr+1);
++			memmove(ptr, ptr+1, strlen(ptr));
+ 		} //end if
+ 		else
+ 		{
+--- openarena.orig/code/botlib/l_script.c
++++ openarena/code/botlib/l_script.c
+@@ -1118,7 +1118,7 @@
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@
+ {
+ 	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 92fe28b..a4e2d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ delban_0_segfault.diff
 #20_dont_build_shipped_jpeg.diff
 30_link_against_local_libspeex.diff
 40_kfreebsd.diff
+memmove.patch

-- 
Packaging for the OpenArena engine