From 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Mon, 22 Jan 2024 10:14:31 -0800 Subject: [PATCH] zlib 1.3.1 --- CMakeLists.txt | 2 +- ChangeLog | 11 +++++++++-- Makefile.in | 4 ++-- README | 6 +++--- contrib/delphi/ZLib.pas | 2 +- contrib/dotzlib/DotZLib/UnitTests.cs | 2 +- contrib/infback9/inftree9.c | 6 +++--- contrib/minizip/configure.ac | 2 +- contrib/nuget/nuget.csproj | 4 ++-- contrib/pascal/zlibpas.pas | 2 +- contrib/vstudio/readme.txt | 2 +- contrib/vstudio/vc10/zlib.rc | 8 ++++---- contrib/vstudio/vc10/zlibvc.def | 2 +- contrib/vstudio/vc11/zlib.rc | 8 ++++---- contrib/vstudio/vc11/zlibvc.def | 2 +- contrib/vstudio/vc12/zlib.rc | 8 ++++---- contrib/vstudio/vc12/zlibvc.def | 2 +- contrib/vstudio/vc14/zlib.rc | 8 ++++---- contrib/vstudio/vc14/zlibvc.def | 2 +- contrib/vstudio/vc17/zlib.rc | 8 ++++---- contrib/vstudio/vc17/zlibvc.def | 2 +- contrib/vstudio/vc9/zlib.rc | 8 ++++---- contrib/vstudio/vc9/zlibvc.def | 2 +- deflate.c | 4 ++-- deflate.h | 2 +- gzguts.h | 2 +- gzlib.c | 2 +- inftrees.c | 6 +++--- os400/README400 | 2 +- os400/zlib.inc | 8 ++++---- qnx/package.qpg | 10 +++++----- treebuild.xml | 4 ++-- trees.c | 2 +- win32/README-WIN32.txt | 4 ++-- zconf.h | 2 +- zconf.h.cmakein | 2 +- zconf.h.in | 2 +- zlib.3 | 6 +++--- zlib.3.pdf | Bin 19505 -> 25523 bytes zlib.h | 12 ++++++------ zutil.h | 2 +- 41 files changed, 91 insertions(+), 84 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c053a95..15ceebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) project(zlib C) -set(VERSION "1.3.0.1") +set(VERSION "1.3.1") option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON) diff --git a/ChangeLog b/ChangeLog index dfd6524..b801a10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ ChangeLog file for zlib -Changes in 1.3.0.1 (xx Aug 2023) -- +Changes in 1.3.1 (22 Jan 2024) +- Reject overflows of zip header fields in minizip +- Fix bug in inflateSync() for data held in bit buffer +- Add LIT_MEM define to use more memory for a small deflate speedup +- Fix decision on the emission of Zip64 end records in minizip +- Add bounds checking to ERR_MSG() macro, used by zError() +- Neutralize zip file traversal attacks in miniunz +- Fix a bug in ZLIB_DEBUG compiles in check_match() +- Various portability and appearance improvements Changes in 1.3 (18 Aug 2023) - Remove K&R function definitions and zlib2ansi diff --git a/Makefile.in b/Makefile.in index 7200c96..cb8b00a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # Makefile for zlib -# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler +# Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: @@ -28,7 +28,7 @@ CPP=$(CC) -E STATICLIB=libz.a SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.3.0.1 +SHAREDLIBV=libz.so.1.3.1 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) diff --git a/README b/README index 20f7064..c5f9175 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.3.0.1 is a general purpose data compression library. All the code is +zlib 1.3.1 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -31,7 +31,7 @@ Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at https://marknelson.us/posts/1997/01/01/zlib-engine.html . -The changes made in version 1.3.0.1 are documented in the file ChangeLog. +The changes made in version 1.3.1 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . @@ -83,7 +83,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2023 Jean-loup Gailly and Mark Adler + (C) 1995-2024 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 814ffa6..93fa4c9 100644 --- a/contrib/delphi/ZLib.pas +++ b/contrib/delphi/ZLib.pas @@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; const OutBuf: Pointer; BufSize: Integer); const - zlib_version = '1.3.0'; + zlib_version = '1.3.1'; type EZlibError = class(Exception); diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index c5fce22..d4f0980 100644 --- a/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/contrib/dotzlib/DotZLib/UnitTests.cs @@ -156,7 +156,7 @@ namespace DotZLibTests public void Info_Version() { Info info = new Info(); - Assert.AreEqual("1.3.0", Info.Version); + Assert.AreEqual("1.3.1", Info.Version); Assert.AreEqual(32, info.SizeOfUInt); Assert.AreEqual(32, info.SizeOfULong); Assert.AreEqual(32, info.SizeOfPointer); diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 23f3050..ac707ed 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c @@ -1,5 +1,5 @@ /* inftree9.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2023 Mark Adler + * Copyright (C) 1995-2024 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.3.0.1 Copyright 1995-2023 Mark Adler "; + " inflate9 1.3.1 Copyright 1995-2024 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes, static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, - 133, 133, 133, 133, 144, 70, 200}; + 133, 133, 133, 133, 144, 203, 77}; static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac index cdfee49..15ec917 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([minizip], [1.3.0.1], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.3.1], [bugzilla.redhat.com]) AC_CONFIG_SRCDIR([minizip.c]) AM_INIT_AUTOMAKE([foreign]) LT_INIT diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj index b72cbb6..68627f0 100644 --- a/contrib/nuget/nuget.csproj +++ b/contrib/nuget/nuget.csproj @@ -6,8 +6,8 @@ $(PackageId).win $(PackageId).linux $(PackageId).osx - (C) 1995-2023 Jean-loup Gailly and Mark Adler - 1.3.0.1 + (C) 1995-2024 Jean-loup Gailly and Mark Adler + 1.3.1 NuGet Package for consuming native builds of zlib into .NET without complexity.