Re: [PATCH 3/4] describe: use argv-array

From: Jeff King <peff@peff.net>
Date: Jul 9, 2013, 04:51 UTC
Message-ID: <20130709045151.GE27903@sigill.intra.peff.net>
In-Reply-To: <1373236424-25617-4-git-send-email-gitster@pobox.com>

On Sun, Jul 07, 2013 at 03:33:43PM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> +		argv_array_init(&args);
> +		argv_array_push(&args, "name-rev");
> +		argv_array_push(&args, "--name-only");
> +		argv_array_push(&args, "--no-undefined");
> [...]
> -		memcpy(args + i, argv, argc * sizeof(char *));
> -		args[i + argc] = NULL;
> -		return cmd_name_rev(i + argc, args, prefix);
> +		return cmd_name_rev(args.argc, args.argv, prefix);

This leaks the memory allocated by "args". The original did, too, and it is probably not that big a deal (we exit right after anyway). The fix would be something like:

  rc = cmd_name_rev(args.argc, args.argv, prefix);
  argv_array_clear(&args);
  return rc;

-Peff