From: Mikael Magnusson <mikachu@gmail.com>
To: Peter Stephenson <p.stephenson@samsung.com>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: PATCH: Crash bug on garbage input (previously reported to Debian)
Date: Tue, 17 Feb 2015 10:02:14 +0100 [thread overview]
Message-ID: <CAHYJk3RPA5k2-19OCBdObBjyWwgv1PL0RwuKd+eWS5FKL+ZoJg@mail.gmail.com> (raw)
In-Reply-To: <20150216170413.054623af@pwslap01u.europe.root.pri>
On Mon, Feb 16, 2015 at 6:04 PM, Peter Stephenson
<p.stephenson@samsung.com> wrote:
> Here's a simple fix for appending to the input buffer instead of
> replacing it for this case.
>
> diff --git a/Src/input.c b/Src/input.c
> index 9520fdd..f919e57 100644
> --- a/Src/input.c
> +++ b/Src/input.c
> @@ -330,8 +330,37 @@ inputline(void)
> }
> }
> isfirstch = 1;
> - /* Put this into the input channel. */
> - inputsetline(ingetcline, INP_FREE);
> + if ((inbufflags & INP_APPEND) && inbuf) {
> + /*
> + * We need new input but need to be able to back up
> + * over the old input, so append this line.
> + * Pushing the line onto the stack doesn't have the right
> + * effect.
> + *
> + * This is quite a simple and inefficient fix, but currently
> + * we only need it when backing up over a multi-line $((...
> + * that turned out to be a command substitution rather than
> + * a math substitution, which is a very special case.
> + * So it's not worth rewriting.
> + */
> + char *oinbuf = inbuf;
> + int newlen = strlen(ingetcline);
> + int oldlen = (int)(inbufptr - inbuf) + inbufleft;
> + if (inbufflags & INP_FREE) {
> + inbuf = realloc(inbuf, oldlen + newlen + 1);
> + inbufptr += inbuf - oinbuf;
> + strcpy(inbuf + oldlen, ingetcline);
Coverity complains that ingetcline is not freed in the above path.
+free(ingetcline); here?
> + } else {
> + /* Paranoia: don't think this is used */
> + DPUTS(1, "Appending to unallocated input line.");
> + }
> + inbufleft += newlen;
> + inbufct += newlen;
> + inbufflags |= INP_FREE;
> + } else {
> + /* Put this into the input channel. */
> + inputsetline(ingetcline, INP_FREE);
> + }
>
> return 0;
> }
--
Mikael Magnusson
next prev parent reply other threads:[~2015-02-17 9:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 18:25 Bart Schaefer
2015-02-14 21:42 ` Peter Stephenson
2015-02-15 19:26 ` Bart Schaefer
2015-02-16 12:57 ` Peter Stephenson
2015-02-16 17:04 ` Peter Stephenson
2015-02-16 19:39 ` Bart Schaefer
2015-02-17 12:57 ` Peter Stephenson
2015-02-17 17:13 ` Bart Schaefer
2015-02-17 9:02 ` Mikael Magnusson [this message]
2015-02-17 9:39 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHYJk3RPA5k2-19OCBdObBjyWwgv1PL0RwuKd+eWS5FKL+ZoJg@mail.gmail.com \
--to=mikachu@gmail.com \
--cc=p.stephenson@samsung.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).