diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-09 11:26:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-09 11:26:49 -0700 |
| commit | 0147602c2bf1fff790b06295e6139117a381b206 (patch) | |
| tree | 6b47cc8081c2fe556a3a01d1c20880c90b182c61 /builtin | |
| parent | bfbdfa33f6d491904a7d4390280dfc695ec9ae1a (diff) | |
| parent | c8e1ee4f2c8e28b7eef824248f09ba37599593d7 (diff) | |
| download | git-0147602c2bf1fff790b06295e6139117a381b206.tar.gz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/update-index.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index ba54e19cd5..ebea285e1b 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -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) |