about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/complist.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f0b3f11c1..3d549e1ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-02  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 23144: Felix Eckhofer <felix@tribut.de>: 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;