diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2021-01-03 10:55:39 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-01-03 10:55:39 +0100 |
| commit | 3f8ec00b0c54790283cfec675716ef4b8e00bd8a (patch) | |
| tree | 89d99ff038dea5ee9cb9911f2a4783cd373832e0 | |
| parent | 5f2e00f66d11d99dad16c259aff331908bca4267 (diff) | |
| download | busybox-w32-3f8ec00b0c54790283cfec675716ef4b8e00bd8a.tar.gz busybox-w32-3f8ec00b0c54790283cfec675716ef4b8e00bd8a.tar.bz2 busybox-w32-3f8ec00b0c54790283cfec675716ef4b8e00bd8a.zip | |
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 54f004375..f9d59e50e 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -14499,7 +14499,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) | |||
| 14499 | 14499 | ||
| 14500 | if (sflag || minusc == NULL) { | 14500 | if (sflag || minusc == NULL) { |
| 14501 | #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY | 14501 | #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY |
| 14502 | if (iflag) { | 14502 | if (line_input_state) { |
| 14503 | const char *hp = lookupvar("HISTFILE"); | 14503 | const char *hp = lookupvar("HISTFILE"); |
| 14504 | if (!hp) { | 14504 | if (!hp) { |
| 14505 | hp = lookupvar("HOME"); | 14505 | hp = lookupvar("HOME"); |
| @@ -14513,7 +14513,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) | |||
| 14513 | } | 14513 | } |
| 14514 | } | 14514 | } |
| 14515 | if (hp) | 14515 | if (hp) |
| 14516 | line_input_state->hist_file = hp; | 14516 | line_input_state->hist_file = xstrdup(hp); |
| 14517 | # if ENABLE_FEATURE_SH_HISTFILESIZE | 14517 | # if ENABLE_FEATURE_SH_HISTFILESIZE |
| 14518 | hp = lookupvar("HISTFILESIZE"); | 14518 | hp = lookupvar("HISTFILESIZE"); |
| 14519 | line_input_state->max_history = size_from_HISTFILESIZE(hp); | 14519 | line_input_state->max_history = size_from_HISTFILESIZE(hp); |