From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH v2 2/4] help.c::exclude_cmds: realloc() before copy, plug a leak
Date: Thu, 26 Jul 2012 00:16:20 +0800 [thread overview]
Message-ID: <1343232982-10540-3-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1343232982-10540-2-git-send-email-rctay89@gmail.com>
Copying with structural assignment may not take into account that the
LHS struct has sufficient memory, especially since the cmdname->name
member is nonfixed in size. Be unambiguous about it by realloc()'ing it
to be of sufficient size.
Additionally, free the unused cmdnames, which are no longer accessible
anyway.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
help.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/help.c b/help.c
index 6991492..dfb2e9d 100644
--- a/help.c
+++ b/help.c
@@ -20,6 +20,17 @@ void add_cmdname(struct cmdnames *cmds, const char *name, int len)
cmds->names[cmds->cnt++] = ent;
}
+static void copy_cmdname(struct cmdname **dest, struct cmdname *src)
+{
+ struct cmdname *ent = xrealloc(*dest, sizeof(*ent) + src->len + 1);
+
+ ent->len = src->len;
+ memcpy(ent->name, src->name, src->len);
+ ent->name[src->len] = 0;
+
+ *dest = ent;
+}
+
static void clean_cmdnames(struct cmdnames *cmds)
{
int i;
@@ -58,20 +69,25 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)
{
int ci, cj, ei;
int cmp;
+ int last_cj;
ci = cj = ei = 0;
while (ci < cmds->cnt && ei < excludes->cnt) {
cmp = strcmp(cmds->names[ci]->name, excludes->names[ei]->name);
if (cmp < 0)
- cmds->names[cj++] = cmds->names[ci++];
+ copy_cmdname(&cmds->names[cj++], cmds->names[ci++]);
else if (cmp == 0)
ci++, ei++;
else if (cmp > 0)
ei++;
}
+ last_cj = cj;
while (ci < cmds->cnt)
- cmds->names[cj++] = cmds->names[ci++];
+ copy_cmdname(&cmds->names[cj++], cmds->names[ci++]);
+
+ while (last_cj < cmds->cnt)
+ free(cmds->names[last_cj++]);
cmds->cnt = cj;
}
--
1.7.11.1.116.g8228a23
next prev parent reply other threads:[~2012-07-25 16:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-06 6:55 [PATCH 0/4] allow recovery from command name typos Tay Ray Chuan
2012-05-06 6:55 ` [PATCH 1/4] help.c::uniq: plug a leak Tay Ray Chuan
2012-05-06 6:55 ` [PATCH 2/4] help.c::exclude_cmds: " Tay Ray Chuan
2012-05-06 6:55 ` [PATCH 3/4] help.c: plug a leak when help.autocorrect is set Tay Ray Chuan
2012-05-06 6:55 ` [PATCH 4/4] allow recovery from command name typos Tay Ray Chuan
2012-05-06 8:21 ` Jeff King
2012-05-06 16:07 ` Tay Ray Chuan
2012-05-07 9:43 ` Thomas Rast
2012-05-07 15:49 ` Tay Ray Chuan
2012-05-07 17:41 ` Junio C Hamano
2012-05-09 15:06 ` Tay Ray Chuan
2012-05-09 17:03 ` Junio C Hamano
[not found] ` <CAOBOgRaDEgAqXWmdC6hrudkL5OwzeMffbj2RtKMxf2TsYWzotA@mail.gmail.com>
2012-05-06 16:04 ` Tay Ray Chuan
2012-05-06 8:12 ` [PATCH 1/4] help.c::uniq: plug a leak Jeff King
2012-05-06 15:54 ` Tay Ray Chuan
2012-05-07 7:30 ` Jeff King
2012-07-25 16:16 ` [PATCH v2 0/4] allow recovery from command name typos Tay Ray Chuan
2012-07-25 16:16 ` [PATCH v2 1/4] help.c::uniq: plug a leak Tay Ray Chuan
2012-07-25 16:16 ` Tay Ray Chuan [this message]
2012-07-25 16:16 ` [PATCH v2 3/4] help.c: plug leaks with(out) help.autocorrect Tay Ray Chuan
2012-07-25 16:16 ` [PATCH v2 4/4] allow recovery from command name typos Tay Ray Chuan
2012-07-25 17:57 ` Junio C Hamano
2012-07-26 17:08 ` Tay Ray Chuan
2012-07-26 17:26 ` Jeff King
2012-07-26 17:59 ` Junio C Hamano
2012-07-26 18:37 ` Jeff King
2012-07-26 17:53 ` Junio C Hamano
2012-07-25 17:47 ` [PATCH v2 3/4] help.c: plug leaks with(out) help.autocorrect Junio C Hamano
2012-07-25 17:39 ` [PATCH v2 2/4] help.c::exclude_cmds: realloc() before copy, plug a leak Junio C Hamano
2012-08-05 18:45 ` [PATCH v3 0/2] allow recovery from command name typos Tay Ray Chuan
2012-08-05 18:45 ` [PATCH v3 1/2] add interface for /dev/tty interaction Tay Ray Chuan
2012-08-05 18:45 ` [PATCH v3 2/2] allow recovery from command name typos Tay Ray Chuan
2012-08-06 0:50 ` Junio C Hamano
2012-08-05 20:11 ` [PATCH v3 1/2] add interface for /dev/tty interaction Junio C Hamano
2012-08-06 19:45 ` Jeff King
2012-08-06 19:56 ` Jeff King
2012-08-06 20:01 ` Junio C Hamano
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=1343232982-10540-3-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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.
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).