From 01e57b5d91b0c9f2ac93708c5c2cbcd4731ddd34 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 23 Jun 2014 09:05:47 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/merge.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'builtin/merge.c') diff --git a/builtin/merge.c b/builtin/merge.c index 428ca247bd..e50323d423 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); } } -- cgit v1.2.1