From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Feb 2018 21:39:14 +0000 (-0800)
Subject: Merge branch 'jc/mailinfo-cleanup-fix'
X-Git-Tag: v2.17.0-rc0~114
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/46e915c42bdef79caf65ebdd26ee39aa0c011ebc?hp=cbf0240f82fc6b7072c7d18fa56caace4902a44b

Merge branch 'jc/mailinfo-cleanup-fix'

Corner case bugfix.

* jc/mailinfo-cleanup-fix:
mailinfo: avoid segfault when can't open files
---

diff --git a/mailinfo.c b/mailinfo.c
index a89db22ab0..d04142ccc7 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -1167,11 +1167,13 @@ void clear_mailinfo(struct mailinfo *mi)
 	strbuf_release(&mi->inbody_header_accum);
 	free(mi->message_id);
 
-	for (i = 0; mi->p_hdr_data[i]; i++)
-		strbuf_release(mi->p_hdr_data[i]);
+	if (mi->p_hdr_data)
+		for (i = 0; mi->p_hdr_data[i]; i++)
+			strbuf_release(mi->p_hdr_data[i]);
 	free(mi->p_hdr_data);
-	for (i = 0; mi->s_hdr_data[i]; i++)
-		strbuf_release(mi->s_hdr_data[i]);
+	if (mi->s_hdr_data)
+		for (i = 0; mi->s_hdr_data[i]; i++)
+			strbuf_release(mi->s_hdr_data[i]);
 	free(mi->s_hdr_data);
 
 	while (mi->content < mi->content_top) {