{"thread":{"id":"28751","subject":"[PATCH 1/2] pretty.c: free get_header() return value","startedAt":"2011-10-23T11:51:34Z","lastAt":"2011-10-23T11:51:35Z","messageCount":2,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"178198","messageId":"1319370695-12638-1-git-send-email-pclouds@gmail.com","threadId":"28751","inReplyTo":null,"subject":"[PATCH 1/2] pretty.c: free get_header() return value","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2011-10-23T11:51:34Z","receivedAt":"2011-10-23T11:51:34Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n pretty.c |    7 +++----\n 1 files changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/pretty.c b/pretty.c\nindex f45eb54..375ff7b 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -1094,7 +1094,6 @@ void format_commit_message(const struct commit *commit,\n {\n \tstruct format_commit_context context;\n \tstatic const char utf8[] = \"UTF-8\";\n-\tconst char *enc;\n \tconst char *output_enc = pretty_ctx->output_encoding;\n \n \tmemset(&context, 0, sizeof(context));\n@@ -1103,10 +1102,10 @@ void format_commit_message(const struct commit *commit,\n \tcontext.wrap_start = sb->len;\n \tcontext.message = commit->buffer;\n \tif (output_enc) {\n-\t\tenc = get_header(commit, \"encoding\");\n-\t\tenc = enc ? enc : utf8;\n-\t\tif (strcmp(enc, output_enc))\n+\t\tchar *enc = get_header(commit, \"encoding\");\n+\t\tif (strcmp(enc ? enc : utf8, output_enc))\n \t\t\tcontext.message = logmsg_reencode(commit, output_enc);\n+\t\tfree(enc);\n \t}\n \n \tstrbuf_expand(sb, format, format_commit_item, &context);\n-- \n1.7.3.1.256.g2539c.dirty\n"},{"id":"178199","messageId":"1319370695-12638-2-git-send-email-pclouds@gmail.com","threadId":"28751","inReplyTo":"1319370695-12638-1-git-send-email-pclouds@gmail.com","subject":"[PATCH 2/2] pretty.c: use original commit message if reencoding fails","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2011-10-23T11:51:35Z","receivedAt":"2011-10-23T11:51:35Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n pretty.c |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --git a/pretty.c b/pretty.c\nindex 375ff7b..230fe1c 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -1103,8 +1103,11 @@ void format_commit_message(const struct commit *commit,\n \tcontext.message = commit->buffer;\n \tif (output_enc) {\n \t\tchar *enc = get_header(commit, \"encoding\");\n-\t\tif (strcmp(enc ? enc : utf8, output_enc))\n+\t\tif (strcmp(enc ? enc : utf8, output_enc)) {\n \t\t\tcontext.message = logmsg_reencode(commit, output_enc);\n+\t\t\tif (!context.message)\n+\t\t\t\tcontext.message = commit->buffer;\n+\t\t}\n \t\tfree(enc);\n \t}\n \n-- \n1.7.3.1.256.g2539c.dirty\n"}]}