[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.7.4.1 1.7.4.2 deflate.c 1.2 1.2.4.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt deflate.c 
Log Message:
CMake 2.8.1-rc1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmzlib/CMakeLists.txt,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -C 2 -d -r1.7.4.1 -r1.7.4.2
*** CMakeLists.txt	1 Oct 2009 21:21:27 -0000	1.7.4.1
--- CMakeLists.txt	28 Jan 2010 21:48:20 -0000	1.7.4.2
***************
*** 7,13 ****
    )
  
- # Match all headers for dependencies but complain about none.
- INCLUDE_REGULAR_EXPRESSION("^.*$")
- 
  # source files for zlib
  SET(ZLIB_SRCS
--- 7,10 ----

Index: deflate.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmzlib/deflate.c,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** deflate.c	11 Sep 2007 15:22:29 -0000	1.2
--- deflate.c	28 Jan 2010 21:48:20 -0000	1.2.4.1
***************
*** 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));