[Cmake-commits] [cmake-commits] david.cole committed deflate.c 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Nov 18 16:47:02 EST 2009


Update of /cvsroot/CMake/CMake/Utilities/cmzlib
In directory public:/mounts/ram/cvs-serv27505/Utilities/cmzlib

Modified Files:
	deflate.c 
Log Message:
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.


Index: deflate.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmzlib/deflate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** deflate.c	11 Sep 2007 15:22:29 -0000	1.2
--- deflate.c	18 Nov 2009 21:47:00 -0000	1.3
***************
*** 286,289 ****
--- 286,296 ----
  
      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));



More information about the Cmake-commits mailing list