aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-10-21 14:24:13 +0200
committerJunio C Hamano <gitster@pobox.com>2016-10-21 09:31:53 -0700
commit03a4e260e2bf4eebd7ea6658d24507fbf80f3ecd (patch)
treec6be96927cc799ac349aec109ea992966b9cb9b2 /builtin
parent285abf561aa410b3a9dfb2887e42fcdc4c461971 (diff)
downloadgit-03a4e260e2bf4eebd7ea6658d24507fbf80f3ecd.tar.gz
git-03a4e260e2bf4eebd7ea6658d24507fbf80f3ecd.tar.xz
sequencer: plug memory leaks for the option values
The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves like a one-shot command when it reads its configuration: memory is allocated and released only when the command exits. This is kind of okay for git-cherry-pick, which *is* a one-shot command. All the work to make the sequencer its work horse was done to allow using the functionality as a library function, though, including proper clean-up after use. To remedy that, take custody of the option values in question, allocating and duping literal constants as needed and freeing them at end. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/revert.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 7365559c9..ba5a88cbf 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -174,6 +174,10 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
if (argc > 1)
usage_with_options(usage_str, options);
+
+ /* These option values will be free()d */
+ opts->gpg_sign = xstrdup_or_null(opts->gpg_sign);
+ opts->strategy = xstrdup_or_null(opts->strategy);
}
int cmd_revert(int argc, const char **argv, const char *prefix)