Merge branch 'jk/mailinfo-iterative-unquote-comment'
The code to parse the From e-mail header has been updated to avoid recursion. * jk/mailinfo-iterative-unquote-comment: mailinfo: avoid recursion when unquoting From headers t5100: make rfc822 comment test more careful
This commit is contained in:
@ -59,6 +59,7 @@ static void parse_bogus_from(struct mailinfo *mi, const struct strbuf *line)
|
||||
static const char *unquote_comment(struct strbuf *outbuf, const char *in)
|
||||
{
|
||||
int take_next_literally = 0;
|
||||
int depth = 1;
|
||||
|
||||
strbuf_addch(outbuf, '(');
|
||||
|
||||
@ -72,11 +73,14 @@ static const char *unquote_comment(struct strbuf *outbuf, const char *in)
|
||||
take_next_literally = 1;
|
||||
continue;
|
||||
case '(':
|
||||
in = unquote_comment(outbuf, in);
|
||||
strbuf_addch(outbuf, '(');
|
||||
depth++;
|
||||
continue;
|
||||
case ')':
|
||||
strbuf_addch(outbuf, ')');
|
||||
return in;
|
||||
if (!--depth)
|
||||
return in;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user