From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 18:07:55 +0000 (-0800)
Subject: builtin-add: fix command line building to call interactive
X-Git-Tag: v1.5.4-rc0~77^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=324ccbd6a09816af830b22b02bbeb06349141849;p=git.git

builtin-add: fix command line building to call interactive

The earlier 7c0ab4458994aa895855abc4a504cf693ecc0cf1 (Teach builtin-add
to pass multiple paths to git-add--interactive) did not allocate enough,
and had unneeded (void*) pointer arithmetic.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-add.c b/builtin-add.c
index dd895dfb1..7c6a296af 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -138,9 +138,10 @@ static void refresh(int verbose, const char **pathspec)
 int interactive_add(int argc, const char **argv)
 {
 	int status;
-	const char **args = xmalloc(sizeof(const char *) * (argc + 1));
+	const char **args = xcalloc(sizeof(const char *), (argc + 2));
+
 	args[0] = "add--interactive";
-	memcpy((void *)args + sizeof(const char *), argv, sizeof(const char *) * argc);
+	memcpy(&(args[1]), argv, sizeof(const char *) * argc);
 	args[argc + 1] = NULL;
 
 	status = run_command_v_opt(args, RUN_GIT_CMD);