threads / patch / 45545

patchupdate-index: fix xgetcwd() related memory leak

Subject: [PATCH] update-index: fix xgetcwd() related memory leak

## tl;dr

2 messages between Mar 30, 2017 and Mar 30, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Christian Couder· Mar 30, 2017, 06:22 UTC · lore

As xgetcwd() returns an allocated buffer, we should free this buffer when we don't need it any more.

This was found by Coverity.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/update-index.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Show changes to builtin/update-index.c +5 −1

diff --git a/builtin/update-index.c b/builtin/update-index.c
index d74d72cc7f..ebfc09faa0 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -125,12 +125,16 @@ static int test_if_untracked_cache_is_supported(void)
 	struct stat st;
 	struct stat_data base;
 	int fd, ret = 0;
+	char *cwd;
 
 	strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
 	if (!mkdtemp(mtime_dir.buf))
 		die_errno("Could not make temporary directory");
 
-	fprintf(stderr, _("Testing mtime in '%s' "), xgetcwd());
+	cwd = xgetcwd();
+	fprintf(stderr, _("Testing mtime in '%s' "), cwd);
+	free(cwd);
+
 	atexit(remove_test_directory);
 	xstat_mtime_dir(&st);
 	fill_stat_data(&base, &st);

-- 
2.12.2.510.ge1104a5ee5.dirty

Jeff King· Mar 30, 2017, 06:23 UTC · re: Christian Couder · lore

Re: [PATCH] update-index: fix xgetcwd() related memory leak

On Thu, Mar 30, 2017 at 08:22:08AM +0200, Christian Couder wrote:

Show 30 quoted lines

> As xgetcwd() returns an allocated buffer, we should free this
> buffer when we don't need it any more.
> 
> This was found by Coverity.
> 
> Reported-by: Jeff King <peff@peff.net>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  builtin/update-index.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index d74d72cc7f..ebfc09faa0 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -125,12 +125,16 @@ static int test_if_untracked_cache_is_supported(void)
>  	struct stat st;
>  	struct stat_data base;
>  	int fd, ret = 0;
> +	char *cwd;
>  
>  	strbuf_addstr(&mtime_dir, "mtime-test-XXXXXX");
>  	if (!mkdtemp(mtime_dir.buf))
>  		die_errno("Could not make temporary directory");
>  
> -	fprintf(stderr, _("Testing mtime in '%s' "), xgetcwd());
> +	cwd = xgetcwd();
> +	fprintf(stderr, _("Testing mtime in '%s' "), cwd);
> +	free(cwd);
> +

Yep, this solution looks obviously correct to me.

-Peff