diff options
Diffstat (limited to 'builtin/annotate.c')
| -rw-r--r-- | builtin/annotate.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/builtin/annotate.c b/builtin/annotate.c index 58ff977a23..7f754f2309 100644 --- a/builtin/annotate.c +++ b/builtin/annotate.c @@ -3,20 +3,34 @@ * * Copyright (C) 2006 Ryan Anderson */ + #include "git-compat-util.h" #include "builtin.h" #include "strvec.h" -int cmd_annotate(int argc, const char **argv, const char *prefix) +int cmd_annotate(int argc, + const char **argv, + const char *prefix, + 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); + /* + * `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; } |