|
 |
c6dbd9 |
From 075bb94e05771e5f7132c35811c0d19d03ceda16 Mon Sep 17 00:00:00 2001
|
|
|
c6dbd9 |
From: Axel Beckert <abe@deuxchevaux.org>
|
|
|
c6dbd9 |
Date: Wed, 18 Sep 2013 23:50:04 +0200
|
|
|
c6dbd9 |
Subject: [PATCH 1/2] 31735: fix off-by-one in completion utility cache code.
|
|
|
c6dbd9 |
Was causing crashes in complex completions, particularly with taskwarrior
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
Upstream-commit: 844e569b632fc032576edc039f793be47fde724e
|
|
|
c6dbd9 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
c6dbd9 |
---
|
|
|
c6dbd9 |
Src/Zle/computil.c | 2 +-
|
|
|
c6dbd9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
|
|
|
c6dbd9 |
index cd508d0..2c323ee 100644
|
|
|
c6dbd9 |
--- a/Src/Zle/computil.c
|
|
|
c6dbd9 |
+++ b/Src/Zle/computil.c
|
|
|
c6dbd9 |
@@ -2992,7 +2992,7 @@ get_cvdef(char *nam, char **args)
|
|
|
c6dbd9 |
return *p;
|
|
|
c6dbd9 |
} else if (!min || !*p || (*p)->lastt < (*min)->lastt)
|
|
|
c6dbd9 |
min = p;
|
|
|
c6dbd9 |
- if (i)
|
|
|
c6dbd9 |
+ if (i > 0)
|
|
|
c6dbd9 |
min = p;
|
|
|
c6dbd9 |
if ((new = parse_cvdef(nam, args))) {
|
|
|
c6dbd9 |
freecvdef(*min);
|
|
|
c6dbd9 |
--
|
|
|
c6dbd9 |
2.5.5
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
From b5f4eda96e0543693334ccc6ada2f87ab60cd7c7 Mon Sep 17 00:00:00 2001
|
|
|
c6dbd9 |
From: "Barton E. Schaefer" <schaefer@zsh.org>
|
|
|
c6dbd9 |
Date: Thu, 19 Sep 2013 07:55:53 -0700
|
|
|
c6dbd9 |
Subject: [PATCH 2/2] 31737: same loop counter fix in get_cadef as get_cvdef.
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
Upstream-commit: 61deff76f22310ce9e10dd2174b8cf8e48c678ee
|
|
|
c6dbd9 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
c6dbd9 |
---
|
|
|
c6dbd9 |
Src/Zle/computil.c | 2 +-
|
|
|
c6dbd9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
c6dbd9 |
|
|
|
c6dbd9 |
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
|
|
|
c6dbd9 |
index 2c323ee..f8983c3 100644
|
|
|
c6dbd9 |
--- a/Src/Zle/computil.c
|
|
|
c6dbd9 |
+++ b/Src/Zle/computil.c
|
|
|
c6dbd9 |
@@ -1608,7 +1608,7 @@ get_cadef(char *nam, char **args)
|
|
|
c6dbd9 |
return *p;
|
|
|
c6dbd9 |
} else if (!min || !*p || (*p)->lastt < (*min)->lastt)
|
|
|
c6dbd9 |
min = p;
|
|
|
c6dbd9 |
- if (i)
|
|
|
c6dbd9 |
+ if (i > 0)
|
|
|
c6dbd9 |
min = p;
|
|
|
c6dbd9 |
if ((new = parse_cadef(nam, args))) {
|
|
|
c6dbd9 |
freecadef(*min);
|
|
|
c6dbd9 |
--
|
|
|
c6dbd9 |
2.5.5
|
|
|
c6dbd9 |
|