gpg-interface: provide clear helper for struct signature_check

Michael J Gruber · gitster · commit 01e57b5d91b0 · 2014-06-23T15:50:29.000-07:00
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 &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -1532,8 +1532,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,

Original file line number	Diff line number	Diff line change
`@@ -1282,10 +1282,7 @@ int cmd_merge(int argc, const char *argv, const char prefix)`
`1282`	`1282`	`printf(_("Commit %s has a good GPG signature by %s\n"),`
`1283`	`1283`	`hex, signature_check.signer);`
`1284`	`1284`
`1285`		`- free(signature_check.gpg_output);`
`1286`		`- free(signature_check.gpg_status);`
`1287`		`- free(signature_check.signer);`
`1288`		`- free(signature_check.key);`
	`1285`	`+ signature_check_clear(&signature_check);`
`1289`	`1286`	`}`
`1290`	`1287`	`}`
`1291`	`1288`
Original file line number	Diff line number	Diff line change
`@@ -1532,8 +1532,7 @@ void format_commit_message(const struct commit *commit,`
`1532`	`1532`
`1533`	`1533`	`free(context.commit_encoding);`
`1534`	`1534`	`logmsg_free(context.message, commit);`
`1535`		`- free(context.signature_check.gpg_output);`
`1536`		`- free(context.signature_check.signer);`
	`1535`	`+ signature_check_clear(&context.signature_check);`
`1537`	`1536`	`}`
`1538`	`1537`
`1539`	`1538`	`static void pp_header(struct pretty_print_context *pp,`