diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-11 22:14:44 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-11 22:14:44 +0000 |
| commit | 9c5eb0ee805754913c4c300cc42420f6fdbbba92 (patch) | |
| tree | 21905746fc9df978df548c96bd5cccf7610e8fc1 /Src | |
| parent | 8c292440390c2b6277d5ca13b028f8d64b3332a5 (diff) | |
| download | zsh-9c5eb0ee805754913c4c300cc42420f6fdbbba92.tar.gz zsh-9c5eb0ee805754913c4c300cc42420f6fdbbba92.tar.xz zsh-9c5eb0ee805754913c4c300cc42420f6fdbbba92.zip | |
Merge of 23144: NULL pointer when ending interactive search in menu select.
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Zle/complist.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |