Re: [PATCH 3/3] builtin/apply: tighten (dis)similarity index parsing

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 3, 2013, 20:50 UTC
Message-ID: <7vd2wh86m4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <2cac21192f79f9fbb5822417775954eba29064fa.1359901732.git.john@keeping.me.uk>

John Keeping <john@keeping.me.uk> writes:

Show 25 quoted lines

> diff --git a/builtin/apply.c b/builtin/apply.c
> index 6c11e8b..4745e75 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -1041,15 +1041,17 @@ static int gitdiff_renamedst(const char *line, struct patch *patch)
>  
>  static int gitdiff_similarity(const char *line, struct patch *patch)
>  {
> -	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
> -		patch->score = 0;
> +	unsigned long val = strtoul(line, NULL, 10);
> +	if (val <= 100)
> +		patch->score = val;
>  	return 0;
>  }
>  
>  static int gitdiff_dissimilarity(const char *line, struct patch *patch)
>  {
> -	if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
> -		patch->score = 0;
> +	unsigned long val = strtoul(line, NULL, 10);
> +	if (val <= 100)
> +		patch->score = val;
>  	return 0;
>  }

This makes sort of sense; .score is used only for display and not for making any decision, so as long as you know it is initialized to zero when the call to this function is made, it should be OK.

Thanks.