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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-10-27 06:29:43 +0000 (Wed, 27 Oct 2010)
New Revision: 1084

Added:
   expect/trunk/debian/patches/21-match.patch
Modified:
   expect/trunk/debian/changelog
   expect/trunk/debian/patches/series
Log:
[expect]
  * Added patch by upstream which fixes crash during exact string matching
    in expect command if the search pattern contains non-ASCII characters.


Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog	2010-09-24 12:58:44 UTC (rev 1083)
+++ expect/trunk/debian/changelog	2010-10-27 06:29:43 UTC (rev 1084)
@@ -1,8 +1,9 @@
-expect (5.44.1.15-4) UNRELEASED; urgency=low
+expect (5.44.1.15-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added patch by upstream which fixes crash during exact string matching
+    in expect command if the search pattern contains non-ASCII characters.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 06 Sep 2010 15:43:15 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 27 Oct 2010 10:29:04 +0400
 
 expect (5.44.1.15-3) unstable; urgency=low
 

Added: expect/trunk/debian/patches/21-match.patch
===================================================================
--- expect/trunk/debian/patches/21-match.patch	                        (rev 0)
+++ expect/trunk/debian/patches/21-match.patch	2010-10-27 06:29:43 UTC (rev 1084)
@@ -0,0 +1,17 @@
+Author: Upstream
+Description: Patch fixes segfault for matching exact string with
+ non-ASCII characters in it.
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3095935&group_id=13179&atid=313179
+
+--- expect-5.44.1.15.orig/expect.c
++++ expect-5.44.1.15/expect.c
+@@ -946,6 +946,9 @@
+ 	expDiagLogU(expPrintify(Tcl_GetString(e->pat)));
+ 	expDiagLog("\"? ");
+ 	if (p) {
++	    /* Bug 3095935. Go from #bytes to #chars */
++	    patLength = Tcl_NumUtfChars (pat, patLength);
++
+ 	    e->simple_start = p - str;
+ 	    o->e = e;
+ 	    o->matchlen = patLength;

Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series	2010-09-24 12:58:44 UTC (rev 1083)
+++ expect/trunk/debian/patches/series	2010-10-27 06:29:43 UTC (rev 1084)
@@ -15,3 +15,4 @@
 18-non-linux.patch
 19-tk-init.patch
 20-two-asterisks.patch
+21-match.patch