about summary refs log tree commit diff stats
path: root/cache.c
diff options
context:
space:
mode:
authorJohn Keeping2014-01-12 16:49:40 +0000
committerJason A. Donenfeld2014-01-12 19:32:20 +0100
commit382ecf152e1bd9546f6c84ace71c62ca07f6648b (patch)
treeb3a66c0bbab90bd5bd4abf20647c5203061099a8 /cache.c
parentfilter: split filter functions into their own file (diff)
downloadcgit-382ecf152e1bd9546f6c84ace71c62ca07f6648b.tar.gz
cgit-382ecf152e1bd9546f6c84ace71c62ca07f6648b.zip
cache: don't leave cache_slot fields uninitialized
Valgrind says:

==18344== Conditional jump or move depends on uninitialised value(s)
==18344==    at 0x406C83: open_slot (cache.c:63)
==18344==    by 0x407478: cache_ls (cache.c:403)
==18344==    by 0x404C9A: process_request (cgit.c:639)
==18344==    by 0x406BD2: fill_slot (cache.c:190)
==18344==    by 0x4071A0: cache_process (cache.c:284)
==18344==    by 0x404461: main (cgit.c:952)
==18344==  Uninitialised value was created by a stack allocation
==18344==    at 0x40738B: cache_ls (cache.c:375)

This is caused by the keylen field being used to calculate whether or
not a slot is matched.  We never then check the value of this and the
length of data read depends on the key length read from the file so this
isn't dangerous, but it's nice to avoid branching based on uninitialized
data.

Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'cache.c')
-rw-r--r--cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.c b/cache.c index d339435..fa83ddc 100644 --- a/cache.c +++ b/cache.c
@@ -376,7 +376,7 @@ int cache_ls(const char *path)
376 DIR *dir; 376 DIR *dir;
377 struct dirent *ent; 377 struct dirent *ent;
378 int err = 0; 378 int err = 0;
379 struct cache_slot slot; 379 struct cache_slot slot = { 0 };
380 struct strbuf fullname = STRBUF_INIT; 380 struct strbuf fullname = STRBUF_INIT;
381 size_t prefixlen; 381 size_t prefixlen;
382 382