From: Rolf K. <lab...@us...> - 2007-04-02 21:11:54
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29005 Modified Files: unzip.c zip.c zlib.rc Log Message: Fix a possible error due to an uninitialized stack variable, when reading a ZIP archive that has no global comment information at all. Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** unzip.c 7 Jan 2006 20:06:23 -0000 1.5 --- unzip.c 2 Apr 2007 21:11:48 -0000 1.6 *************** *** 175,179 **** { unsigned char c; ! int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) { --- 175,182 ---- { unsigned char c; ! int err; ! ! *pi = 0; ! err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) { Index: zlib.rc =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.rc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zlib.rc 7 Jan 2006 20:06:23 -0000 1.4 --- zlib.rc 2 Apr 2007 21:11:48 -0000 1.5 *************** *** 3,8 **** #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 1,2,3,0 ! PRODUCTVERSION 1,2,3,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 --- 3,8 ---- #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 1,2,3,1 ! PRODUCTVERSION 1,2,3,1 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 *************** *** 18,22 **** BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "1.2.3.0.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" --- 18,22 ---- BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "1.2.3.1.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** zip.c 7 Jan 2006 20:06:23 -0000 1.7 --- zip.c 2 Apr 2007 21:11:48 -0000 1.8 *************** *** 344,348 **** { unsigned char c; ! int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) { --- 344,351 ---- { unsigned char c; ! int err; ! ! *pi = 0; ! err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); if (err==1) { |