diff options
| author | Denys Vlasenko | 2021-01-03 10:55:39 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2021-03-09 00:28:26 +0100 |
| commit | 67cc582d4289c5de521d11b08307c8ab26ee1e28 (patch) | |
| tree | 741f8b52c5df073b30ed7746b125ece7a458c6f1 | |
| parent | ee1e0987e4c81b4a5369174ce22b0671198abb6b (diff) | |
| download | busybox-67cc582d4289c5de521d11b08307c8ab26ee1e28.zip busybox-67cc582d4289c5de521d11b08307c8ab26ee1e28.tar.gz | |
ash: make a strdup copy of $HISTFILE for line editing
Otherwise if $HISTFILE is unset or reassigned, bad things can happen.
function old new delta
ash_main 1210 1218 +8
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index f16d7fb..ecbfbf0 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -14499,7 +14499,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) if (sflag || minusc == NULL) { #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY - if (iflag) { + if (line_input_state) { const char *hp = lookupvar("HISTFILE"); if (!hp) { hp = lookupvar("HOME"); @@ -14513,7 +14513,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) } } if (hp) - line_input_state->hist_file = hp; + line_input_state->hist_file = xstrdup(hp); # if ENABLE_FEATURE_SH_HISTFILESIZE hp = lookupvar("HISTFILESIZE"); line_input_state->max_history = size_from_HISTFILESIZE(hp); |