[git commit branch/1_36_stable] lineedit: fix crash when icanon set with -echo
Denys Vlasenko
vda.linux at googlemail.com
Tue Apr 25 14:47:22 UTC 2023
commit: https://git.busybox.net/busybox/commit/?id=38d2d26a5fec3dfd24493c8b42a90e4c413f80d5
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/1_36_stable
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 at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
libbb/lineedit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index ed7c42ba8..c87d6064a 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
More information about the busybox-cvs
mailing list