[PATCHv3 1/5] gpg-interface: provide clear helper for struct signature_check
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jun 23, 2014, 07:05 UTC
- Message-ID
- <872a2ba85cc1d9e6c3be1cd4a882dbf08b7c656d.1403506792.git.git@drmicha.warpmail.net>
- In-Reply-To
- <cover.1402655838.git.git@drmicha.warpmail.net>
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> --- builtin/merge.c | 5 +---- gpg-interface.c | 12 ++++++++++++ gpg-interface.h | 1 + pretty.c | 3 +-- 4 files changed, 15 insertions(+), 6 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); } } diff --git a/gpg-interface.c b/gpg-interface.c index 8b0e874..e71b59d 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -7,6 +7,18 @@ static char *configured_signing_key; static const char *gpg_program = "gpg"; +void signature_check_clear(struct signature_check *sigc) +{ + free(sigc->gpg_output); + free(sigc->gpg_status); + free(sigc->signer); + free(sigc->key); + sigc->gpg_output = NULL; + sigc->gpg_status = NULL; + sigc->signer = NULL; + sigc->key = NULL; +} + void set_signing_key(const char *key) { free(configured_signing_key); diff --git a/gpg-interface.h b/gpg-interface.h index a85cb5b..9f0784a 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -13,6 +13,7 @@ struct signature_check { char *key; }; +extern void signature_check_clear(struct signature_check *sigc); extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key); extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output, struct strbuf *gpg_status); extern int git_gpg_config(const char *, const char *, void *); diff --git a/pretty.c b/pretty.c index 4f51287..ac901b8 100644 --- a/pretty.c +++ b/pretty.c @@ -1537,8 +1537,7 @@ void format_commit_message(const struct commit *commit, free(context.commit_encoding); logmsg_free(context.message, commit); - free(context.signature_check.gpg_output); - free(context.signature_check.signer); + signature_check_clear(&context.signature_check); } static void pp_header(struct pretty_print_context *pp,
-- 2.0.0.426.g37dbf84