mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
"update-index --cacheinfo" in 2.0 crashes on a malformed command line. * jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument
This commit is contained in:
commit
0147602c2b
|
@ -637,6 +637,9 @@ static int parse_new_style_cacheinfo(const char *arg,
|
|||
unsigned long ul;
|
||||
char *endp;
|
||||
|
||||
if (!arg)
|
||||
return -1;
|
||||
|
||||
errno = 0;
|
||||
ul = strtoul(arg, &endp, 8);
|
||||
if (errno || endp == arg || *endp != ',' || (unsigned int) ul != ul)
|
||||
|
|
|
@ -29,6 +29,10 @@ test_expect_success 'update-index -h with corrupt index' '
|
|||
test_i18ngrep "[Uu]sage: git update-index" broken/usage
|
||||
'
|
||||
|
||||
test_expect_success '--cacheinfo complains of missing arguments' '
|
||||
test_must_fail git update-index --cacheinfo
|
||||
'
|
||||
|
||||
test_expect_success '--cacheinfo does not accept blob null sha1' '
|
||||
echo content >file &&
|
||||
git add file &&
|
||||
|
|
Loading…
Reference in a new issue