From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH 1/2] read_info_alternates: read contents into strbuf
Date: Mon, 18 Sep 2017 19:42:53 -0700 [thread overview]
Message-ID: <20170919024253.GC175206@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <20170918155429.hgql4ngayun5nbyd@sigill.intra.peff.net>
Jeff King wrote:
> Reported-by: Michael Haggerty <mhagger@alum.mit.edu>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> sha1_file.c | 29 +++++++++--------------------
> 1 file changed, 9 insertions(+), 20 deletions(-)
Thanks for tracking it down.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
[...]
> +++ b/sha1_file.c
[...]
> @@ -427,28 +427,17 @@ static void link_alt_odb_entries(const char *alt, int len, int sep,
>
> static void read_info_alternates(const char * relative_base, int depth)
> {
> - char *map;
> - size_t mapsz;
> - struct stat st;
> char *path;
> - int fd;
> + struct strbuf buf = STRBUF_INIT;
>
> path = xstrfmt("%s/info/alternates", relative_base);
> - fd = git_open(path);
> - free(path);
> - if (fd < 0)
> - return;
> - if (fstat(fd, &st) || (st.st_size == 0)) {
> - close(fd);
> + if (strbuf_read_file(&buf, path, 1024) < 0) {
> + free(path);
> return;
strbuf_read_file is careful to release buf on failure, so this doesn't
leak (but it's a bit subtle).
What happened to the !st.st_size case? Is it eliminated for
simplicity?
The rest looks good.
Thanks,
Jonathan
next prev parent reply other threads:[~2017-09-19 2:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-18 15:51 [PATCH 0/2] fix read past end of array in alternates files Jeff King
2017-09-18 15:54 ` [PATCH 1/2] read_info_alternates: read contents into strbuf Jeff King
2017-09-19 0:08 ` Junio C Hamano
2017-09-19 2:42 ` Jonathan Nieder [this message]
2017-09-19 5:03 ` Jeff King
2017-09-18 15:55 ` [PATCH 2/2] read_info_alternates: warn on non-trivial errors Jeff King
2017-09-19 2:46 ` Jonathan Nieder
2017-09-19 5:15 ` Jeff King
2017-09-19 2:36 ` [PATCH 0/2] fix read past end of array in alternates files Jonathan Nieder
2017-09-19 4:57 ` Jeff King
2017-09-19 19:40 ` [PATCH v2 " Jeff King
2017-09-19 19:41 ` [PATCH v2 1/2] read_info_alternates: read contents into strbuf Jeff King
2017-09-19 19:41 ` [PATCH v2 2/2] read_info_alternates: warn on non-trivial errors Jeff King
2017-09-20 2:44 ` [PATCH v2 0/2] fix read past end of array in alternates files 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170919024253.GC175206@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).