diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-05-26 22:43:51 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-05-26 22:43:51 +0000 |
| commit | 09aaf50cda52fb852d0fb2b63ca4c6511136e930 (patch) | |
| tree | cfd95d45a79c0fa6946f1c5e9fbfd565496998e1 | |
| parent | 7c87409d6214b384741fed2543fcd9a590c6b20d (diff) | |
| download | zsh-09aaf50cda52fb852d0fb2b63ca4c6511136e930.tar.gz zsh-09aaf50cda52fb852d0fb2b63ca4c6511136e930.tar.xz zsh-09aaf50cda52fb852d0fb2b63ca4c6511136e930.zip | |
22464: bad recursion if error in prompt substitution
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index ddd744217..2156a70ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-26 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 22464: Src/Zle/zle_main.c: an error in prompt substitution could + cause bad recursion karma. + 2006-05-25 Wayne Davison <wayned@users.sourceforge.net> * 22454, Hideki ONO: Completion/Unix/Command/_ls: added support diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 904bf148e..5751d5329 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1509,10 +1509,15 @@ recursiveedit(UNUSED(char **args)) void reexpandprompt(void) { - free(lpromptbuf); - lpromptbuf = promptexpand(raw_lp ? *raw_lp : NULL, 1, NULL, NULL); - free(rpromptbuf); - rpromptbuf = promptexpand(raw_rp ? *raw_rp : NULL, 1, NULL, NULL); + static reexpanding; + + if (!reexpanding++) { + free(lpromptbuf); + lpromptbuf = promptexpand(raw_lp ? *raw_lp : NULL, 1, NULL, NULL); + free(rpromptbuf); + rpromptbuf = promptexpand(raw_rp ? *raw_rp : NULL, 1, NULL, NULL); + } + reexpanding--; } /**/ |