[Pkg-tcltk-commits] r1537 - in expect/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-11-04 04:30:40 +0000 (Mon, 04 Nov 2013)
New Revision: 1537

Added:
   expect/trunk/debian/patches/23-memmove.patch
Modified:
   expect/trunk/debian/changelog
   expect/trunk/debian/patches/series
Log:
[expect]
  * Added patch which replaces memcpy my memmove for copying possibly
    overlapping memory area, thanks to Per Cederqvist (closes: #728663).


Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog	2013-10-12 18:02:59 UTC (rev 1536)
+++ expect/trunk/debian/changelog	2013-11-04 04:30:40 UTC (rev 1537)
@@ -1,8 +1,9 @@
-expect (5.45-5) UNRELEASED; urgency=low
+expect (5.45-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added patch which replaces memcpy my memmove for copying possibly
+    overlapping memory area, thanks to Per Cederqvist (closes: #728663).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 06 Oct 2013 09:19:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 04 Nov 2013 08:28:43 +0400
 
 expect (5.45-4) unstable; urgency=low
 

Added: expect/trunk/debian/patches/23-memmove.patch
===================================================================
--- expect/trunk/debian/patches/23-memmove.patch	                        (rev 0)
+++ expect/trunk/debian/patches/23-memmove.patch	2013-11-04 04:30:40 UTC (rev 1537)
@@ -0,0 +1,17 @@
+Author: Per Cederqvist <ceder at lysator.liu.se>
+Description: Fix for copying overlapping memory area.
+Last-Modified: Mon, 04 Nov 2013 08:23:51 +0400
+Bug-Debian: http://bugs.debian.org/728663
+Bug: https://sourceforge.net/p/expect/patches/16/
+
+--- a/expect.c
++++ b/expect.c
+@@ -1094,7 +1094,7 @@
+ 			/* shift remaining elements down */
+ 			/* but only if there are any left */
+ 			if (i+1 != ecmd->ecd.count) {
+-				memcpy(&ecmd->ecd.cases[i],
++				memmove(&ecmd->ecd.cases[i],
+ 				       &ecmd->ecd.cases[i+1],
+ 					((ecmd->ecd.count - i) - 1) * 
+ 					sizeof(struct exp_cmd_descriptor *));

Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series	2013-10-12 18:02:59 UTC (rev 1536)
+++ expect/trunk/debian/patches/series	2013-11-04 04:30:40 UTC (rev 1537)
@@ -11,3 +11,4 @@
 16-logfile.patch
 18-non-linux.patch
 22-segfault-with-stubs.patch
+23-memmove.patch