mailinfo: re-fix MIME multipart boundary parsing
Recent changes to is_multipart_boundary() caused git-mailinfo to segfault. The reason was after handling the end of the boundary the code tried to look for another boundary. Because the boundary list was empty, dereferencing the pointer to the top of the boundary caused the program to go boom. The fix is to check to see if the list is empty and if so go on its merry way instead of looking for another boundary. I also fixed a couple of increments and decrements that didn't look correct relating to content_top. The boundary test case was updated to catch future problems like this again. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Don Zickus committed
Aug 14, 2008 at 11:35 UTC
289796dd29dd656734cfd59b657deb943a71cf6a
2 files changed
+4
-3
builtin-mailinfo.c
+3
-3
@@ -175,7 +175,7 @@ static void handle_content_type(struct strbuf *line)
175
message_type = TYPE_OTHER;
176
if (slurp_attr(line->buf, "boundary=", boundary)) {
177
strbuf_insert(boundary, 0, "--", 2);
178
- if (content_top++ >= &content[MAX_BOUNDARIES]) {
178
+ if (++content_top > &content[MAX_BOUNDARIES]) {
179
fprintf(stderr, "Too many boundaries to handle\n");
180
exit(1);
181
}
@@ -603,7 +603,7 @@ static void handle_filter(struct strbuf *line);
603
static int find_boundary(void)
604
{
605
while (!strbuf_getline(&line, fin, '\n')) {
606
- if (is_multipart_boundary(&line))
606
+ if (*content_top && is_multipart_boundary(&line))
607
return 1;
608
}
609
return 0;
@@ -626,7 +626,7 @@ again:
626
/* technically won't happen as is_multipart_boundary()
627
will fail first. But just in case..
628
*/
629
- if (content_top-- < content) {
629
+ if (--content_top < content) {
630
fprintf(stderr, "Detected mismatched boundaries, "
631
"can't recover\n");
632
exit(1);
t/t5100/sample.mbox
+1
@@ -500,3 +500,4 @@ index 3e5fe51..aabfe5c 100644
500
1.6.0.rc2
501
502
--=-=-=--
503
+