diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-02-01 00:24:40 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-02-01 00:24:40 +0100 |
| commit | f3384aafc86fa0e8b5085ad9d5c006626d80981d (patch) | |
| tree | 53f82231e933edfd6f9fb31e44ca189fc57fb5ff | |
| parent | 2d082be2cf1ba851ddbca35f84d9b6fb5e42ed34 (diff) | |
| download | zsh-f3384aafc86fa0e8b5085ad9d5c006626d80981d.tar.gz zsh-f3384aafc86fa0e8b5085ad9d5c006626d80981d.zip | |
Add patch by Bart Schaefer to fix segfault in is_cond_binary_op
| -rw-r--r-- | debian/patches/fix-segfault-in-is_cond_binary_op.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/debian/patches/fix-segfault-in-is_cond_binary_op.patch b/debian/patches/fix-segfault-in-is_cond_binary_op.patch new file mode 100644 index 000000000..f03362f5f --- /dev/null +++ b/debian/patches/fix-segfault-in-is_cond_binary_op.patch @@ -0,0 +1,18 @@ +Description: Fix segfault in is_cond_binary_op when compiling with -fPIE + The issue possibly also pops up under other circumstances. +Author: Bart Schaefer <schaefer@brasslantern.com> +Origin: http://www.zsh.org/mla/workers/2016/msg00394.html + +Index: zsh/Src/text.c +=================================================================== +--- zsh.orig/Src/text.c 2016-01-24 17:19:53.947656591 +0100 ++++ zsh/Src/text.c 2016-02-01 00:15:09.098327625 +0100 +@@ -47,7 +47,7 @@ + */ + static const char *cond_binary_ops[] = { + "=", "!=", "<", ">", "-nt", "-ot", "-ef", "-eq", +- "-ne", "-lt", "-gt", "-le", "-ge", "=~" ++ "-ne", "-lt", "-gt", "-le", "-ge", "=~", NULL + }; + + static char *tptr, *tbuf, *tlim, *tpending; diff --git a/debian/patches/series b/debian/patches/series index 857f0f26d..d0f0c477b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ further-mitigate-test-suite-hangs.patch +fix-segfault-in-is_cond_binary_op.patch |