From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun, 23 Oct 2011 11:51:34 +0000 (+1100)
Subject: pretty.c: free get_header() return value
X-Git-Tag: v1.7.8-rc1~14^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cd7a92b97d0b4321c19e8952a3a9b1874e3abb5;p=git.git

pretty.c: free get_header() return value

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/pretty.c b/pretty.c
index 854993475..34d668cc3 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1013,7 +1013,6 @@ void format_commit_message(const struct commit *commit,
 {
 	struct format_commit_context context;
 	static const char utf8[] = "UTF-8";
-	const char *enc;
 	const char *output_enc = pretty_ctx->output_encoding;
 
 	memset(&context, 0, sizeof(context));
@@ -1022,10 +1021,10 @@ void format_commit_message(const struct commit *commit,
 	context.wrap_start = sb->len;
 	context.message = commit->buffer;
 	if (output_enc) {
-		enc = get_header(commit, "encoding");
-		enc = enc ? enc : utf8;
-		if (strcmp(enc, output_enc))
+		char *enc = get_header(commit, "encoding");
+		if (strcmp(enc ? enc : utf8, output_enc))
 			context.message = logmsg_reencode(commit, output_enc);
+		free(enc);
 	}
 
 	strbuf_expand(sb, format, format_commit_item, &context);