about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2016-01-16 11:03:07 +0000
committerJason A. Donenfeld2016-01-17 17:05:39 +0100
commit33bc949a1e927e14479568518bd92e70998e25f8 (patch)
tree4b31bd761caeea599aad3dad07d39341a900a112
parentcache: use size_t for string lengths (diff)
downloadcgit-33bc949a1e927e14479568518bd92e70998e25f8.tar.gz
cgit-33bc949a1e927e14479568518bd92e70998e25f8.zip
cache: don't check for match with no key
We call open_slot() from cache_ls() without a key since we simply want
to read the path out of the header.  Should the file happen to contain
an empty key then we end up calling memcmp() with NULL and a non-zero
length.  Fix this by assigning slot->match only if a key is set, which
is always will be in the code paths where we use slot->match.

Coverity-id: 13807
Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cache.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cache.c b/cache.c index df1b4a3..6736a01 100644 --- a/cache.c +++ b/cache.c
@@ -61,8 +61,9 @@ static int open_slot(struct cache_slot *slot)
61 if (bufz) 61 if (bufz)
62 bufkeylen = bufz - slot->buf; 62 bufkeylen = bufz - slot->buf;
63 63
64 slot->match = bufkeylen == slot->keylen && 64 if (slot->key)
65 !memcmp(slot->key, slot->buf, bufkeylen + 1); 65 slot->match = bufkeylen == slot->keylen &&
66 !memcmp(slot->key, slot->buf, bufkeylen + 1);
66 67
67 return 0; 68 return 0;
68} 69}