diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-02-14 10:43:10 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-02-14 10:43:10 -0800 |
| commit | 2c13d9fb0da0ec513e577c2589ec545df665326e (patch) | |
| tree | 85dddadf947f3da1255245925644675aa44efb0f /Src/input.c | |
| parent | dd988542f466fd87e7353a9cd89d4b1d7b6f075d (diff) | |
| download | zsh-2c13d9fb0da0ec513e577c2589ec545df665326e.tar.gz zsh-2c13d9fb0da0ec513e577c2589ec545df665326e.tar.xz zsh-2c13d9fb0da0ec513e577c2589ec545df665326e.zip | |
34543: Prevent crash on garbage bytes inside $(...)
Garbage input (nul bytes, etc.) can cause the $(...) parser to become confused during look-ahead and attempt to back up the input too far. This commit catches the error but does not fix the underlying cause.
Diffstat (limited to 'Src/input.c')
| -rw-r--r-- | Src/input.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Src/input.c b/Src/input.c index 2ecac7bdc..9520fdd6d 100644 --- a/Src/input.c +++ b/Src/input.c @@ -393,12 +393,14 @@ inungetc(int c) if (((inbufflags & INP_LINENO) || !strin) && c == '\n') lineno--; } -#ifdef DEBUG else if (!(inbufflags & INP_CONT)) { +#ifdef DEBUG /* Just for debugging */ fprintf(stderr, "Attempt to inungetc() at start of input.\n"); - } #endif + zerr("Garbled input at %c (binary file as commands?)", c); + return; + } else { /* * The character is being backed up from a previous input stack |