[PATCH] Allow emails with boundaries to work again
From: Don Zickus <hidden>
Date: 2016-06-15 22:45:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. Signed-Off-by: Don Zickus <redacted> --- builtin-mailinfo.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 6ae2bf3..0209e82 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c@@ -175,7 +175,7 @@ static void handle_content_type(struct strbuf *line) message_type = TYPE_OTHER; if (slurp_attr(line->buf, "boundary=", boundary)) { strbuf_insert(boundary, 0, "--", 2); - if (content_top++ >= &content[MAX_BOUNDARIES]) { + if (++content_top > &content[MAX_BOUNDARIES]) { fprintf(stderr, "Too many boundaries to handle\n"); exit(1); }
@@ -626,7 +626,7 @@ again: /* technically won't happen as is_multipart_boundary() will fail first. But just in case.. */ - if (content_top-- < content) { + if (--content_top < content) { fprintf(stderr, "Detected mismatched boundaries, " "can't recover\n"); exit(1);
@@ -635,9 +635,11 @@ again: strbuf_release(&newline); /* skip to the next boundary */ - if (!find_boundary()) - return 0; - goto again; + if (*content_top) { + if (!find_boundary()) + return 0; + goto again; + } } /* set some defaults */
--
1.5.5.1