mailinfo: avoid segfault when can't open files
If <msg> or <patch> files can't be opened, then mailinfo() returns an error before it even initializes mi->p_hdr_data or mi->s_hdr_data. When cmd_mailinfo() then calls clear_mailinfo(), we dereference the NULL pointers trying to free their contents. Signed-off-by: Juan F. Codagnone <jcodagnone@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Juan F. Codagnone committed
Jan 24, 2018 at 13:56 UTC
4e801463c7d2b26de747d3684cf75b722b0594af
1 file changed
+6
-4
mailinfo.c
+6
-4
@@ -1149,11 +1149,13 @@ void clear_mailinfo(struct mailinfo *mi)
1149
strbuf_release(&mi->inbody_header_accum);
1150
free(mi->message_id);
1151
1152
- for (i = 0; mi->p_hdr_data[i]; i++)
1153
- strbuf_release(mi->p_hdr_data[i]);
1152
+ if (mi->p_hdr_data)
1153
+ for (i = 0; mi->p_hdr_data[i]; i++)
1154
+ strbuf_release(mi->p_hdr_data[i]);
1155
free(mi->p_hdr_data);
1155
- for (i = 0; mi->s_hdr_data[i]; i++)
1156
- strbuf_release(mi->s_hdr_data[i]);
1156
+ if (mi->s_hdr_data)
1157
+ for (i = 0; mi->s_hdr_data[i]; i++)
1158
+ strbuf_release(mi->s_hdr_data[i]);
1159
free(mi->s_hdr_data);
1160
1161
while (mi->content < mi->content_top) {