development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-23 18:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/nth-parent-parse'

Browse source 
The object name parser for "Nth parent" syntax has been made more
robust against integer overflows.

* rs/nth-parent-parse:
  sha1-name: check for overflow of N in "foo^N" and "foo~N"
  rev-parse: demonstrate overflow of N for "foo^N" and "foo~N"
This commit is contained in:
Junio C Hamano 2019-10-07 11:32:57 +09:00
parent 7f17913161 59fa5f5a25
commit 773521df26
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sha1-name.c
View file

@ -1160,13 +1160,22 @@ static enum get_oid_result get_oid_1(struct repository *r,
}
if (has_suffix) {
int num = 0;
unsigned int num = 0;
int len1 = cp - name;
cp++;
while (cp < name + len)
num = num * 10 + *cp++ - '0';
while (cp < name + len) {
unsigned int digit = *cp++ - '0';
if (unsigned_mult_overflows(num, 10))
return MISSING_OBJECT;
num *= 10;
if (unsigned_add_overflows(num, digit))
return MISSING_OBJECT;
num += digit;
}
if (!num && len1 == len - 1)
num = 1;
else if (num > INT_MAX)
return MISSING_OBJECT;
if (has_suffix == '^')
return get_parent(r, name, len1, oid, num);
/* else if (has_suffix == '~') -- goes without saying */

8
t/t1506-rev-parse-diagnosis.sh
View file

@ -214,4 +214,12 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' '
test_cmp expect actual
'
test_expect_success 'reject Nth parent if N is too high' '
test_must_fail git rev-parse HEAD^100000000000000000000000000000000
'
test_expect_success 'reject Nth ancestor if N is too high' '
test_must_fail git rev-parse HEAD~100000000000000000000000000000000
'
test_done