diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2013-05-07 16:55:11 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-08 12:13:12 -0700 |
| commit | 83d16bc7bec92ea3f705f559c5a13589cb7c1f92 (patch) | |
| tree | e0a54ee1049d9bb4c821deb539134dbd5805c109 | |
| parent | sha1_name: reorganize get_sha1_basic() (diff) | |
| download | tgif-83d16bc7bec92ea3f705f559c5a13589cb7c1f92.tar.xz | |
sha1_name: check @{-N} errors sooner
It's trivial to check for them in the @{N} parsing loop.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sha1_name.c b/sha1_name.c index 45b89d9df0..446cc62c4e 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -448,7 +448,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) if (len && str[len-1] == '}') { for (at = len-4; at >= 0; at--) { if (str[at] == '@' && str[at+1] == '{') { - if (at == 0 && str[2] == '-') { + if (str[at+2] == '-') { + if (at != 0) + /* @{-N} not at start */ + return -1; nth_prior = 1; continue; } @@ -497,10 +500,6 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) unsigned long co_time; int co_tz, co_cnt; - /* a @{-N} placed anywhere except the start is an error */ - if (str[at+2] == '-') - return -1; - /* Is it asking for N-th entry, or approxidate? */ for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { char ch = str[at+2+i]; |