From: Junio C Hamano Date: Sun, 18 Oct 2015 22:40:06 +0000 (-0700) Subject: mailinfo: do not let find_boundary() touch global "line" directly X-Git-Tag: v2.7.0-rc0~64^2~20 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbbcafd0607d6fccb2fde39c49619bcd7a7b910b?ds=inline;hp=--cc mailinfo: do not let find_boundary() touch global "line" directly With the previous two commits, we established that the local variable "line" in handle_body() and handle_boundary() functions always refer to the global "line" that is used as the common and shared "current line from the input". They are the only callers of the last function that refers to the global line directly, i.e. find_boundary(). Pass "line" as a parameter to this leaf function to complete the clean-up. Now the only function that directly refers to the global "line" is the caller of handle_body() at the very beginning of this whole callchain. Signed-off-by: Junio C Hamano --- fbbcafd0607d6fccb2fde39c49619bcd7a7b910b diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 9b3f349a11..e7edd743ce 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -786,10 +786,10 @@ static int read_one_header_line(struct strbuf *line, FILE *in) return 1; } -static int find_boundary(void) +static int find_boundary(struct strbuf *line) { - while (!strbuf_getline(&line, fin, '\n')) { - if (*content_top && is_multipart_boundary(&line)) + while (!strbuf_getline(line, fin, '\n')) { + if (*content_top && is_multipart_boundary(line)) return 1; } return 0; @@ -821,7 +821,7 @@ static int handle_boundary(struct strbuf *line, int *filter_stage, int *header_s strbuf_release(&newline); /* skip to the next boundary */ - if (!find_boundary()) + if (!find_boundary(line)) return 0; goto again; } @@ -850,7 +850,7 @@ static void handle_body(struct strbuf *line) /* Skip up to the first boundary */ if (*content_top) { - if (!find_boundary()) + if (!find_boundary(line)) goto handle_body_out; }