diff options
| author | Akos Somfai | 2023-04-03 22:52:06 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2023-04-12 13:49:14 +0200 |
| commit | 853cfe927fd656a2688ac2bfc81c69e1004c44df (patch) | |
| tree | a31e9cccf8b225e430fb4c01c786213752d4441d | |
| parent | 550e6d8fbd05ea0ab60ff3e542327efb4e9cc254 (diff) | |
| download | busybox-853cfe927fd656a2688ac2bfc81c69e1004c44df.zip busybox-853cfe927fd656a2688ac2bfc81c69e1004c44df.tar.gz | |
lineedit: fix crash when icanon set with -echo
When icanon is set with -echo (e.g. ssh from an emacs shell) then
S.state will remain null but later it will be deferenced causing ash to
crash. Fix: additional check on state.
Signed-off-by: Akos Somfai <akos.somfai@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/lineedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 625884a..bdae109 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -254,7 +254,7 @@ static NOINLINE const char *get_homedir_or_NULL(void) const char *home; # if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH - home = state->sh_get_var ? state->sh_get_var("HOME") : getenv("HOME"); + home = state && state->sh_get_var ? state->sh_get_var("HOME") : getenv("HOME"); # else home = getenv("HOME"); # endif @@ -2038,7 +2038,7 @@ static void parse_and_put_prompt(const char *prmt_ptr) if (!cwd_buf) { const char *home; # if EDITING_HAS_sh_get_var - cwd_buf = state->sh_get_var + cwd_buf = state && state->sh_get_var ? xstrdup(state->sh_get_var("PWD")) : xrealloc_getcwd_or_warn(NULL); # else |