Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / mailinfo.c

diff --git a/mailinfo.c b/mailinfo.c
index 742fa376ab01142de8bb7410c37657a5ede4a391..5681d9130db6f54971cf2b966d1743b87a130b86 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -447,19 +447,21 @@ static int convert_to_utf8(struct mailinfo *mi,
                           struct strbuf *line, const char *charset)
 {
        char *out;
+       size_t out_len;
 
        if (!mi->metainfo_charset || !charset || !*charset)
                return 0;
 
        if (same_encoding(mi->metainfo_charset, charset))
                return 0;
-       out = reencode_string(line->buf, mi->metainfo_charset, charset);
+       out = reencode_string_len(line->buf, line->len,
+                                 mi->metainfo_charset, charset, &out_len);
        if (!out) {
                mi->input_error = -1;
                return error("cannot convert from %s to %s",
                             charset, mi->metainfo_charset);
        }
-       strbuf_attach(line, out, strlen(out), strlen(out));
+       strbuf_attach(line, out, out_len, out_len);
        return 0;
 }
 
@@ -1136,6 +1138,11 @@ static void handle_info(struct mailinfo *mi)
                else
                        continue;
 
+               if (memchr(hdr->buf, '\0', hdr->len)) {
+                       error("a NUL byte in '%s' is not allowed.", header[i]);
+                       mi->input_error = -1;
+               }
+
                if (!strcmp(header[i], "Subject")) {
                        if (!mi->keep_subject) {
                                cleanup_subject(mi, hdr);