From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: PATCH: Crash bug on garbage input (previously reported to Debian)
Date: Tue, 17 Feb 2015 09:39:07 +0000 [thread overview]
Message-ID: <20150217093907.7f94af49@pwslap01u.europe.root.pri> (raw)
In-Reply-To: <CAHYJk3RPA5k2-19OCBdObBjyWwgv1PL0RwuKd+eWS5FKL+ZoJg@mail.gmail.com>
On Tue, 17 Feb 2015 10:02:14 +0100
Mikael Magnusson <mikachu@gmail.com> wrote:
> Coverity complains that ingetcline is not freed in the above path.
> +free(ingetcline); here?
Yes, that's missing, and we might as well handle the other branch now
it's working --- I didn't bother when fixing the bug but it's not
exactly difficult to do.
pws
diff --git a/Src/input.c b/Src/input.c
index f919e57..92b1ad1 100644
--- a/Src/input.c
+++ b/Src/input.c
@@ -348,12 +348,13 @@ inputline(void)
int oldlen = (int)(inbufptr - inbuf) + inbufleft;
if (inbufflags & INP_FREE) {
inbuf = realloc(inbuf, oldlen + newlen + 1);
- inbufptr += inbuf - oinbuf;
- strcpy(inbuf + oldlen, ingetcline);
} else {
- /* Paranoia: don't think this is used */
- DPUTS(1, "Appending to unallocated input line.");
+ inbuf = zalloc(oldlen + newlen + 1);
+ memcpy(inbuf, oinbuf, oldlen);
}
+ inbufptr += inbuf - oinbuf;
+ strcpy(inbuf + oldlen, ingetcline);
+ free(ingetcline);
inbufleft += newlen;
inbufct += newlen;
inbufflags |= INP_FREE;
prev parent reply other threads:[~2015-02-17 9:49 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
2015-02-17 9:39 ` Peter Stephenson [this message]
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=20150217093907.7f94af49@pwslap01u.europe.root.pri \
--to=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).