Skip to content

Commit bffce88

Browse files
committed
Merge branch 'jc/mailinfo-cleanup-fix' into maint
Corner case bugfix. * jc/mailinfo-cleanup-fix: mailinfo: avoid segfault when can't open files
2 parents b502aa4 + 4e80146 commit bffce88

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

mailinfo.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,11 +1167,13 @@ void clear_mailinfo(struct mailinfo *mi)
11671167
strbuf_release(&mi->inbody_header_accum);
11681168
free(mi->message_id);
11691169

1170-
for (i = 0; mi->p_hdr_data[i]; i++)
1171-
strbuf_release(mi->p_hdr_data[i]);
1170+
if (mi->p_hdr_data)
1171+
for (i = 0; mi->p_hdr_data[i]; i++)
1172+
strbuf_release(mi->p_hdr_data[i]);
11721173
free(mi->p_hdr_data);
1173-
for (i = 0; mi->s_hdr_data[i]; i++)
1174-
strbuf_release(mi->s_hdr_data[i]);
1174+
if (mi->s_hdr_data)
1175+
for (i = 0; mi->s_hdr_data[i]; i++)
1176+
strbuf_release(mi->s_hdr_data[i]);
11751177
free(mi->s_hdr_data);
11761178

11771179
while (mi->content < mi->content_top) {

0 commit comments

Comments
 (0)