summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Terbeck <ft@bewatermyfriend.org>2011-02-24 22:20:01 +0100
committerFrank Terbeck <ft@bewatermyfriend.org>2011-03-02 18:55:25 +0100
commit40086130a134290aa652017b6e1abf8259f12fb9 (patch)
tree469d7db74050664714fd197a64b7ba47d0ec3e23
parented6737b2f824692defc76092e3a5c57d9b1e0c1e (diff)
downloadzsh-40086130a134290aa652017b6e1abf8259f12fb9.tar.gz
zsh-40086130a134290aa652017b6e1abf8259f12fb9.zip
Fix endless loop due to lexer bug (Closes: #353863)
Patch from Peter Stephenson: <http://www.zsh.org/mla/workers/2011/msg00237.html>
-rw-r--r--debian/patches/0005-lexer-fix.diff16
-rw-r--r--debian/patches/series1
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/0005-lexer-fix.diff b/debian/patches/0005-lexer-fix.diff
new file mode 100644
index 000000000..b1a06e9fb
--- /dev/null
+++ b/debian/patches/0005-lexer-fix.diff
@@ -0,0 +1,16 @@
+Bugfix from upstream. See:
+ <http://www.zsh.org/mla/workers/2011/msg00237.html>
+
+Index: pkg-zsh/Src/lex.c
+===================================================================
+--- pkg-zsh.orig/Src/lex.c 2011-02-24 22:14:59.000000000 +0100
++++ pkg-zsh/Src/lex.c 2011-02-24 22:15:04.000000000 +0100
+@@ -1823,7 +1823,7 @@
+ int zp = lexflags;
+
+ gotword();
+- if (zp == 1 && !lexflags) {
++ if ((zp & LEXFLAGS_ZLE) && !lexflags) {
+ if (zshlextext == copy)
+ zshlextext = tokstr;
+ return 0;
diff --git a/debian/patches/series b/debian/patches/series
index 1dfab8e2f..01e95c85a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0002-vcs_info-svn-detection.diff
0003-regex-match-crash-fix.diff
0004-support-yodl3.diff
+0005-lexer-fix.diff