diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2026-06-10 08:59:27 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2026-06-10 08:59:27 -0400 |
| commit | b460816602167718f78a6233164e8875f49b75b2 (patch) | |
| tree | 3523c02237a3f023b0a257e1ac7414488ec70b23 | |
| parent | a833685ecb9681b611b9c4c44b2e4c40932fcd6f (diff) | |
Bash-5.3 patch 15: fix read builtin to avoid cases where -1 is used as an index into the input bufferHEADmaster
| -rw-r--r-- | builtins/read.def | 9 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/builtins/read.def b/builtins/read.def index 854b7b8f..6189dafa 100644 --- a/builtins/read.def +++ b/builtins/read.def @@ -538,7 +538,8 @@ read_builtin (WORD_LIST *list) so we have to save input_string temporarily, run the unwind- protects, then restore input_string so we can use it later */ orig_input_string = 0; - input_string[i] = '\0'; /* make sure it's terminated */ + if (i >= 0) + input_string[i] = '\0'; /* make sure it's terminated */ if (i == 0) { t = (char *)xmalloc (1); @@ -592,8 +593,7 @@ read_builtin (WORD_LIST *list) termsave.attrs = ttattrs; ttset = ttattrs; - i = silent ? ttfd_cbreak (fd, &ttset) : ttfd_onechar (fd, &ttset); - if (i < 0) + if ((silent ? ttfd_cbreak (fd, &ttset) : ttfd_onechar (fd, &ttset)) < 0) sh_ttyerror (1); tty_modified = 1; add_unwind_protect (uw_ttyrestore, &termsave); @@ -609,8 +609,7 @@ read_builtin (WORD_LIST *list) termsave.attrs = ttattrs; ttset = ttattrs; - i = ttfd_noecho (fd, &ttset); /* ttnoecho (); */ - if (i < 0) + if (ttfd_noecho (fd, &ttset) < 0) sh_ttyerror (1); tty_modified = 1; diff --git a/patchlevel.h b/patchlevel.h index 79e18af4..13c6c07d 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 14 +#define PATCHLEVEL 15 #endif /* _PATCHLEVEL_H_ */ |
