From b2d709b22e2c291bfdb680f2b10bcbd4e5bd5514 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 2 Feb 2007 23:47:47 +0000 Subject: 23144: Felix Eckhofer : NULL pointer in complist.c --- ChangeLog | 3 +++ Src/Zle/complist.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index f0b3f11c1..3d549e1ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-02-02 Peter Stephenson + * 23144: Felix Eckhofer : Src/Zle/complist.c: + NULL pointer when ending interactive search in menu select. + * 23143: Src/string.c, Src/subst.c: =-expansion failed when there were metacharacters in the following string, but still tried to expand it. It now succeeds. diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 90ea31f66..e723da0f3 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -2079,6 +2079,9 @@ msearchpop(int *backp) { Menusearch s = msearchstack; + if (!s) + return NULL; + if (s->prev) msearchstack = s->prev; -- cgit 1.4.1