1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: update zlib to 1.2.13.1-motley-5daffc7

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/50803
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Node.js GitHub Bot 2023-11-24 19:48:08 +02:00 committed by GitHub
parent ec79232938
commit f4c915c006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/zlib/crc32.c vendored
View File

@ -792,8 +792,8 @@ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
words = (z_word_t const *)buf; words = (z_word_t const *)buf;
/* Do endian check at execution time instead of compile time, since ARM /* Do endian check at execution time instead of compile time, since ARM
processors can change the endianess at execution time. If the processors can change the endianness at execution time. If the
compiler knows what the endianess will be, it can optimize out the compiler knows what the endianness will be, it can optimize out the
check and the unused branch. */ check and the unused branch. */
endian = 1; endian = 1;
if (*(unsigned char *)&endian) { if (*(unsigned char *)&endian) {

5
deps/zlib/deflate.c vendored
View File

@ -168,6 +168,11 @@ local const config configuration_table[10] = {
* bit values at the expense of memory usage). We slide even when level == 0 to * bit values at the expense of memory usage). We slide even when level == 0 to
* keep the hash table consistent if we switch back to level > 0 later. * keep the hash table consistent if we switch back to level > 0 later.
*/ */
#if defined(__has_feature)
# if __has_feature(memory_sanitizer)
__attribute__((no_sanitize("memory")))
# endif
#endif
local void slide_hash(deflate_state *s) { local void slide_hash(deflate_state *s) {
#if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON) #if defined(DEFLATE_SLIDE_HASH_SSE2) || defined(DEFLATE_SLIDE_HASH_NEON)
slide_hash_simd(s->head, s->prev, s->w_size, s->hash_size); slide_hash_simd(s->head, s->prev, s->w_size, s->hash_size);

5
deps/zlib/gzguts.h vendored
View File

@ -7,9 +7,8 @@
# ifndef _LARGEFILE_SOURCE # ifndef _LARGEFILE_SOURCE
# define _LARGEFILE_SOURCE 1 # define _LARGEFILE_SOURCE 1
# endif # endif
# ifdef _FILE_OFFSET_BITS # undef _FILE_OFFSET_BITS
# undef _FILE_OFFSET_BITS # undef _TIME_BITS
# endif
#endif #endif
#ifdef HAVE_HIDDEN #ifdef HAVE_HIDDEN

4
deps/zlib/gzlib.c vendored
View File

@ -311,8 +311,8 @@ int ZEXPORT gzbuffer(gzFile file, unsigned size) {
/* check and set requested size */ /* check and set requested size */
if ((size << 1) < size) if ((size << 1) < size)
return -1; /* need to be able to double it */ return -1; /* need to be able to double it */
if (size < 2) if (size < 8)
size = 2; /* need two bytes to check magic header */ size = 8; /* needed to behave well with flushing */
state->want = size; state->want = size;
return 0; return 0;
} }

13
deps/zlib/zlib.h vendored
View File

@ -230,7 +230,7 @@ ZEXTERN int ZEXPORT deflateInit(z_streamp strm, int level);
Initializes the internal stream state for compression. The fields Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller. If zalloc, zfree and opaque must be initialized before by the caller. If
zalloc and zfree are set to Z_NULL, deflateInit updates them to use default zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
allocation functions. allocation functions. total_in, total_out, adler, and msg are initialized.
The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
1 gives best speed, 9 gives best compression, 0 gives no compression at all 1 gives best speed, 9 gives best compression, 0 gives no compression at all
@ -382,7 +382,8 @@ ZEXTERN int ZEXPORT inflateInit(z_streamp strm);
read or consumed. The allocation of a sliding window will be deferred to read or consumed. The allocation of a sliding window will be deferred to
the first call of inflate (if the decompression does not complete on the the first call of inflate (if the decompression does not complete on the
first call). If zalloc and zfree are set to Z_NULL, inflateInit updates first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
them to use default allocation functions. them to use default allocation functions. total_in, total_out, adler, and
msg are initialized.
inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
memory, Z_VERSION_ERROR if the zlib library version is incompatible with the memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@ -695,7 +696,7 @@ ZEXTERN int ZEXPORT deflateReset(z_streamp strm);
This function is equivalent to deflateEnd followed by deflateInit, but This function is equivalent to deflateEnd followed by deflateInit, but
does not free and reallocate the internal compression state. The stream does not free and reallocate the internal compression state. The stream
will leave the compression level and any other attributes that may have been will leave the compression level and any other attributes that may have been
set unchanged. set unchanged. total_in, total_out, adler, and msg are initialized.
deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL). stream state was inconsistent (such as zalloc or state being Z_NULL).
@ -820,8 +821,9 @@ ZEXTERN int ZEXPORT deflateSetHeader(z_streamp strm,
gzip file" and give up. gzip file" and give up.
If deflateSetHeader is not used, the default gzip header has text false, If deflateSetHeader is not used, the default gzip header has text false,
the time set to zero, and os set to 255, with no extra, name, or comment the time set to zero, and os set to the current operating system, with no
fields. The gzip header is returned to the default state by deflateReset(). extra, name, or comment fields. The gzip header is returned to the default
state by deflateReset().
deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent. stream state was inconsistent.
@ -960,6 +962,7 @@ ZEXTERN int ZEXPORT inflateReset(z_streamp strm);
This function is equivalent to inflateEnd followed by inflateInit, This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate the internal decompression state. The but does not free and reallocate the internal decompression state. The
stream will keep attributes that may have been set by inflateInit2. stream will keep attributes that may have been set by inflateInit2.
total_in, total_out, adler, and msg are initialized.
inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
stream state was inconsistent (such as zalloc or state being Z_NULL). stream state was inconsistent (such as zalloc or state being Z_NULL).

6
doc/contributing/maintaining/maintaining-dependencies.md
View File

@ -32,7 +32,7 @@ This a list of all the dependencies:
* [undici 5.27.2][] * [undici 5.27.2][]
* [uvwasi 0.0.19][] * [uvwasi 0.0.19][]
* [V8 11.8.172.12][] * [V8 11.8.172.12][]
* [zlib 1.2.13.1-motley-dfc48fc][] * [zlib 1.2.13.1-motley-5daffc7][]
Any code which meets one or more of these conditions should Any code which meets one or more of these conditions should
be managed as a dependency: be managed as a dependency:
@ -317,7 +317,7 @@ See [maintaining-web-assembly][] for more informations.
high-performance JavaScript and WebAssembly engine, written in C++. high-performance JavaScript and WebAssembly engine, written in C++.
See [maintaining-V8][] for more informations. See [maintaining-V8][] for more informations.
### zlib 1.2.13.1-motley-dfc48fc ### zlib 1.2.13.1-motley-5daffc7
The [zlib](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib) The [zlib](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib)
dependency lossless data-compression library, dependency lossless data-compression library,
@ -356,4 +356,4 @@ performance improvements not currently available in standard zlib.
[update-openssl-action]: ../../../.github/workflows/update-openssl.yml [update-openssl-action]: ../../../.github/workflows/update-openssl.yml
[uvwasi 0.0.19]: #uvwasi-0019 [uvwasi 0.0.19]: #uvwasi-0019
[v8 11.8.172.12]: #v8-11817212 [v8 11.8.172.12]: #v8-11817212
[zlib 1.2.13.1-motley-dfc48fc]: #zlib-12131-motley-dfc48fc [zlib 1.2.13.1-motley-5daffc7]: #zlib-12131-motley-5daffc7

2
src/zlib_version.h
View File

@ -2,5 +2,5 @@
// Refer to tools/dep_updaters/update-zlib.sh // Refer to tools/dep_updaters/update-zlib.sh
#ifndef SRC_ZLIB_VERSION_H_ #ifndef SRC_ZLIB_VERSION_H_
#define SRC_ZLIB_VERSION_H_ #define SRC_ZLIB_VERSION_H_
#define ZLIB_VERSION "1.2.13.1-motley-dfc48fc" #define ZLIB_VERSION "1.2.13.1-motley-5daffc7"
#endif // SRC_ZLIB_VERSION_H_ #endif // SRC_ZLIB_VERSION_H_