mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 18:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache: don't check for match with no key

Browse Source 
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>
This commit is contained in:
John Keeping 2016-01-16 11:03:07 +00:00 committed by Jason A. Donenfeld
parent 3fbfced740
commit 33bc949a1e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache.c
View File

@ -61,8 +61,9 @@ static int open_slot(struct cache_slot *slot)
if (bufz) if (bufz)
bufkeylen = bufz - slot->buf; bufkeylen = bufz - slot->buf;
slot->match = bufkeylen == slot->keylen && if (slot->key)
!memcmp(slot->key, slot->buf, bufkeylen + 1); slot->match = bufkeylen == slot->keylen &&
!memcmp(slot->key, slot->buf, bufkeylen + 1);
return 0; return 0;
} }