summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2014-06-23 07:05:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-23 22:50:29 (GMT)
commit01e57b5d91b0c9f2ac93708c5c2cbcd4731ddd34 (patch)
tree6cac8943a32b4a22c3c4e78d41a538f77b78a590 /builtin/merge.c
parent0953113bb5687f42bcdfc3d20dd3a125784ad383 (diff)
downloadgit-01e57b5d91b0c9f2ac93708c5c2cbcd4731ddd34.zip
git-01e57b5d91b0c9f2ac93708c5c2cbcd4731ddd34.tar.gz
git-01e57b5d91b0c9f2ac93708c5c2cbcd4731ddd34.tar.bz2
gpg-interface: provide clear helper for struct signature_check
The struct has been growing members whose malloced memory needs to be freed. Do this with one helper function so that no malloced memory shall be left unfreed. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 428ca24..e50323d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1282,10 +1282,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
printf(_("Commit %s has a good GPG signature by %s\n"),
hex, signature_check.signer);
- free(signature_check.gpg_output);
- free(signature_check.gpg_status);
- free(signature_check.signer);
- free(signature_check.key);
+ signature_check_clear(&signature_check);
}
}