From: Jeff King <peff@peff.net>
Date: Tue, 17 Jun 2014 21:40:28 GMT
Subject: Re: [PATCH v3] http: fix charset detection of extract_content_type()
Message-ID: <20140617214025.GB18994@sigill.intra.peff.net>
In-Reply-To: <CAFT+Tg-d6hBact67bjnc2NFghtmBtr7tyuBvA4_QWgz71eJv_g@mail.gmail.com>

On Wed, Jun 18, 2014 at 12:29:59AM +0900, Yi, EungJun wrote:

> From: Yi EungJun <eungjun.yi@navercorp.com>
> 
> extract_content_type() could not extract a charset parameter if the
> parameter is not the first one and there is a whitespace and a following
> semicolon just before the parameter. For example:
> 
>     text/plain; format=fixed ;charset=utf-8
> 
> And it also could not handle correctly some other cases, such as:
> 
>     text/plain; charset=utf-8; format=fixed
>     text/plain; some-param="a long value with ;semicolons;"; charset=utf-8
> 
> Thanks-to: Jeff King <peff@peff.net>
> Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
> ---

Thanks, the patch content looks good here, but...

> diff --git a/http.c b/http.c
> index 2b4f6a3..3a28b21 100644
> --- a/http.c
> +++ b/http.c
> @@ -927,7 +927,7 @@ static int extract_param(const char *raw, const char *name,
>   return -1;
>   raw++;
> 
> - while (*raw && !isspace(*raw))
> + while (*raw && !isspace(*raw) && *raw != ';')
>   strbuf_addch(out, *raw++);
>   return 0;

It looks like your patch has been whitespace-damaged.

-Peff