From 9c5eb0ee805754913c4c300cc42420f6fdbbba92 Mon Sep 17 00:00:00 2001
From: Paul Ackersviller <packersv@users.sourceforge.net>
Date: Sun, 11 Nov 2007 22:14:44 +0000
Subject: Merge of 23144: NULL pointer when ending interactive search in menu
 select.

---
 Src/Zle/complist.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Src')

diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 6a5fb3a74..8dcfe51c3 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1849,6 +1849,9 @@ msearchpop(int *backp)
 {
     Menusearch s = msearchstack;
 
+    if (!s)
+        return NULL;
+
     if (s->prev)
         msearchstack = s->prev;
 
@@ -2838,7 +2841,7 @@ domenuselect(Hookdef dummy, Chdata dat)
 
         } else if ((mode == MM_FSEARCH || mode == MM_BSEARCH) &&
                    cmd == Th(z_backwarddeletechar)) {
-            int back;
+            int back = 1;
             Cmatch **np = msearchpop(&back);
 
             mode = (back ? MM_BSEARCH : MM_FSEARCH);
-- 
cgit 1.4.1