Skip to content

Commit bf0444b

Browse files
nodejs-github-botRafaelGSS
authored andcommitted
deps: update zlib to 1.2.13.1-motley-3ca9f16
PR-URL: #48413 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Marco Ippolito <[email protected]>
1 parent 89aaf16 commit bf0444b

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

deps/zlib/OWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
22
33
4-
54

deps/zlib/contrib/bench/OWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
22
3-

deps/zlib/contrib/tests/fuzzers/deflate_fuzzer.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
3838
int ret =
3939
deflateInit2(&stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
4040
ASSERT(ret == Z_OK);
41+
42+
size_t deflate_bound = deflateBound(&stream, src.size());
43+
4144
std::vector<uint8_t> compressed(src.size() * 2 + 1000);
4245
stream.next_out = compressed.data();
4346
stream.avail_out = compressed.size();
@@ -54,6 +57,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
5457
compressed.resize(compressed.size() - stream.avail_out);
5558
deflateEnd(&stream);
5659

60+
// Check that the bound was correct.
61+
ASSERT(compressed.size() <= deflate_bound);
62+
5763
// Verify that the data decompresses correctly.
5864
ret = inflateInit2(&stream, windowBits);
5965
ASSERT(ret == Z_OK);

deps/zlib/contrib/tests/infcover.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,7 @@ void cover_support(void)
395395
mem_setup(&strm);
396396
strm.avail_in = 0;
397397
strm.next_in = Z_NULL;
398-
char versioncpy[] = ZLIB_VERSION;
399-
versioncpy[0] -= 1;
400-
ret = inflateInit_(&strm, versioncpy, (int)sizeof(z_stream));
398+
ret = inflateInit_(&strm, "!", (int)sizeof(z_stream));
401399
assert(ret == Z_VERSION_ERROR);
402400
mem_done(&strm, "wrong version");
403401

@@ -486,7 +484,8 @@ local unsigned pull(void *desc, unsigned char **buf)
486484

487485
local int push(void *desc, unsigned char *buf, unsigned len)
488486
{
489-
buf += len;
487+
(void)buf;
488+
(void)len;
490489
return desc != Z_NULL; /* force error if desc not null */
491490
}
492491

deps/zlib/zconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ typedef uLong FAR uLongf;
539539
#if !defined(_WIN32) && defined(Z_LARGE64)
540540
# define z_off64_t off64_t
541541
#else
542-
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
542+
# if defined(_WIN32) && !defined(__GNUC__)
543543
# define z_off64_t __int64
544544
# else
545545
# define z_off64_t z_off_t

deps/zlib/zconf.h.cmakein

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ typedef uLong FAR uLongf;
526526
#if !defined(_WIN32) && defined(Z_LARGE64)
527527
# define z_off64_t off64_t
528528
#else
529-
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
529+
# if defined(_WIN32) && !defined(__GNUC__)
530530
# define z_off64_t __int64
531531
# else
532532
# define z_off64_t z_off_t

deps/zlib/zlib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ ZEXTERN int ZEXPORT deflateParams(z_streamp strm,
728728
Then no more input data should be provided before the deflateParams() call.
729729
If this is done, the old level and strategy will be applied to the data
730730
compressed before deflateParams(), and the new level and strategy will be
731-
applied to the the data compressed after deflateParams().
731+
applied to the data compressed after deflateParams().
732732
733733
deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
734734
state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if

doc/contributing/maintaining/maintaining-dependencies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This a list of all the dependencies:
3131
* [undici 5.22.1][]
3232
* [uvwasi 0.0.16][]
3333
* [V8 11.3.244.8][]
34-
* [zlib 1.2.13][]
34+
* [zlib 1.2.13.1-motley-3ca9f16][]
3535

3636
Any code which meets one or more of these conditions should
3737
be managed as a dependency:
@@ -311,7 +311,7 @@ See [maintaining-web-assembly][] for more informations.
311311
high-performance JavaScript and WebAssembly engine, written in C++.
312312
See [maintaining-V8][] for more informations.
313313

314-
### zlib 1.2.13
314+
### zlib 1.2.13.1-motley-3ca9f16
315315

316316
The [zlib](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib)
317317
dependency lossless data-compression library,
@@ -349,4 +349,4 @@ performance improvements not currently available in standard zlib.
349349
[update-openssl-action]: ../../../.github/workflows/update-openssl.yml
350350
[uvwasi 0.0.16]: #uvwasi-0016
351351
[v8 11.3.244.8]: #v8-1132448
352-
[zlib 1.2.13]: #zlib-1213
352+
[zlib 1.2.13.1-motley-3ca9f16]: #zlib-12131-motley-3ca9f16

0 commit comments

Comments
 (0)