diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:16 -0700 |
| commit | bffce882fdf03aa7083d56d038c2dc2be58a9200 (patch) | |
| tree | 4dab4e4c868a5a37a0471b5db527a7f80eb04ea4 | |
| parent | b502aa4f45c9198ee498a09873f2c877911f23d7 (diff) | |
| parent | 4e801463c7d2b26de747d3684cf75b722b0594af (diff) | |
| download | git-bffce882fdf03aa7083d56d038c2dc2be58a9200.tar.gz | |
Merge branch 'jc/mailinfo-cleanup-fix' into maint
Corner case bugfix.
* jc/mailinfo-cleanup-fix:
mailinfo: avoid segfault when can't open files
| -rw-r--r-- | mailinfo.c | 10 |
1 files changed, 6 insertions, 4 deletions
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) { |