mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
builtin/apply: tighten (dis)similarity index parsing
This was prompted by an incorrect warning issued by clang [1], and a suggestion by Linus to restrict the range to check for values greater than INT_MAX since these will give bogus output after casting to int. In fact the (dis)similarity index is a percentage, so reject values greater than 100. [1] http://article.gmane.org/gmane.comp.version-control.git/213857 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7e2010537e
commit
afcb6ac83d
1 changed files with 6 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue