From cf133ff6b35022ee323a6973ae34009016269d79 Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 18 Nov 2009 16:47:00 -0500 Subject: Fix uninitialized variable access in zlib reported by valgrind. Their web site claims it does no harm ( http://www.zlib.net/zlib_faq.html#faq36 ), but fixing it this way eliminates the problem. --- Utilities/cmzlib/deflate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Utilities/cmzlib/deflate.c b/Utilities/cmzlib/deflate.c index 29ce1f6..a5e7a35 100644 --- a/Utilities/cmzlib/deflate.c +++ b/Utilities/cmzlib/deflate.c @@ -285,6 +285,13 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + + // The following memset eliminates the valgrind uninitialized warning + // "swept under the carpet" here: + // http://www.zlib.net/zlib_faq.html#faq36 + // + memset(s->window, 0, s->w_size*2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); -- cgit v0.12