summaryrefslogtreecommitdiff
path: root/expect-5.45-match-gt-numchars-segfault.patch
blob: 1abd424647707b68bb897f9a36852f965227b238 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff -up expect5.45/expect.c.orig expect5.45/expect.c
--- expect5.45/expect.c.orig	2012-02-06 14:15:13.469490744 +0100
+++ expect5.45/expect.c	2012-02-06 14:16:23.596837896 +0100
@@ -2363,7 +2363,12 @@ expMatchProcess(
 
 	/* "!e" means no case matched - transfer by default */
 	if (!e || e->transfer) {
-	    int remainder = numchars-match;
+	    int remainder;
+	    if (match > numchars) {
+		match = numchars;
+		eo->matchlen = match;
+	    }
+	    remainder = numchars-match;
 	    /* delete matched chars from input buffer */
 	    esPtr->printed -= match;
 	    if (numchars != 0) {