Re: [PATCH 1/2] read_info_alternates: read contents into strbuf

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sep 19, 2017, 02:42 UTC
Message-ID: <20170919024253.GC175206@aiede.mtv.corp.google.com>
In-Reply-To: <20170918155429.hgql4ngayun5nbyd@sigill.intra.peff.net>

Jeff King wrote:

Show 5 quoted lines

> 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

[...]

Show 21 quoted lines

> @@ -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