summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-27 23:23:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-27 23:23:46 (GMT)
commit899d8dc392494e78040ea13db202de894040bda8 (patch)
tree0b13799456de241812e1bb44863e31c1851ba19b /sha1_name.c
parent5c415311f743ccb11a50f350ff1c385778f049d6 (diff)
parentb8469ad0578d6b84ec92752a5f8df3ca5828af77 (diff)
downloadgit-899d8dc392494e78040ea13db202de894040bda8.zip
git-899d8dc392494e78040ea13db202de894040bda8.tar.gz
git-899d8dc392494e78040ea13db202de894040bda8.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: test-path-utils: Fix off by one, found by valgrind get_sha1_basic(): fix invalid memory access, found by valgrind
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 159c2ab8..722fc35 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -309,7 +309,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
/* basic@{time or number} format to query ref-log */
reflog_len = at = 0;
- if (str[len-1] == '}') {
+ if (len && str[len-1] == '}') {
for (at = 0; at < len - 1; at++) {
if (str[at] == '@' && str[at+1] == '{') {
reflog_len = (len-1) - (at+2);