1 files changed, 15 insertions, 5 deletions
diff --git a/builtin/annotate.c b/builtin/annotate.c
index ce3dfaafb2..7f754f2309 100644
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -14,13 +14,23 @@ int cmd_annotate(int argc,
 		 struct repository *repo)
 {
 	struct strvec args = STRVEC_INIT;
-	int i;
+	const char **args_copy;
+	int ret;
 
 	strvec_pushl(&args, "annotate", "-c", NULL);
-
-	for (i = 1; i < argc; i++) {
+	for (int i = 1; i < argc; i++)
 		strvec_push(&args, argv[i]);
-	}
 
-	return cmd_blame(args.nr, args.v, prefix, repo);
+	/*
+	 * `cmd_blame()` ends up modifying the array, which causes memory leaks
+	 * if we didn't copy the array here.
+	 */
+	CALLOC_ARRAY(args_copy, args.nr + 1);
+	COPY_ARRAY(args_copy, args.v, args.nr);
+
+	ret = cmd_blame(args.nr, args_copy, prefix, repo);
+
+	strvec_clear(&args);
+	free(args_copy);
+	return ret;
 }