-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/7.0] Upgrade zlib to 1.3.1 (#99474)
* [7.0] Upgrade zlib to 1.3.1 * Bring in patch to remove implicit narrowing conversions from zlib * [PATCH] Make zlib compile clean against C4244 clang equivalent is "implicit-int-conversion" warning The change to deflate.c is legal because 'len' has an upper bound of MAX_STORED, which means it fits cleanly into a 16-bit integer. So writing out 2x 8-bit values will not result in data loss. The change to trees.c is legal because within this loop, 'count' is intended to have an upper bound of 138, with the target assignment only executing if 'count' is bounded by 4. Neither the 'count' local in isolation nor the addition that's part of the target line is expected to result in integer overflow. But even if it did, that's a matter for a different warning code and doesn't impact the correctness of the narrowing cast being considered here. Author: Levi Broderick <levib@microsoft.com> * Update cgmanifest.json and THIRD-PARTY-NOTICES.TXT * Bring back patches comment, remove unnecessary file removal comment.
- Loading branch information
1 parent
b880b97
commit 970ecf6
Showing
37 changed files
with
1,195 additions
and
1,790 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| From 86d96652ddd60f61dc7b0c94b601f6d156d34632 Mon Sep 17 00:00:00 2001 | ||
| From: Levi Broderick <levib@microsoft.com> | ||
| Date: Mon, 28 Aug 2023 15:26:38 -0700 | ||
| Subject: [PATCH] Make zlib compile clean against C4244 clang equivalent is | ||
| "implicit-int-conversion" warning | ||
|
|
||
| The change to deflate.c is legal because 'len' has an upper bound of | ||
| MAX_STORED, which means it fits cleanly into a 16-bit integer. So | ||
| writing out 2x 8-bit values will not result in data loss. | ||
|
|
||
| The change to trees.c is legal because within this loop, 'count' is | ||
| intended to have an upper bound of 138, with the target assignment | ||
| only executing if 'count' is bounded by 4. Neither the 'count' local | ||
| in isolation nor the addition that's part of the target line is | ||
| expected to result in integer overflow. But even if it did, that's a | ||
| matter for a different warning code and doesn't impact the correctness | ||
| of the narrowing cast being considered here. | ||
| --- | ||
| src/native/external/zlib/deflate.c | 8 ++++---- | ||
| src/native/external/zlib/trees.c | 2 +- | ||
| 2 files changed, 5 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/src/native/external/zlib/deflate.c b/src/native/external/zlib/deflate.c | ||
| index d2e1106ef5d..b7636639754 100644 | ||
| --- a/src/native/external/zlib/deflate.c | ||
| +++ b/src/native/external/zlib/deflate.c | ||
| @@ -1738,10 +1738,10 @@ local block_state deflate_stored(s, flush) | ||
| _tr_stored_block(s, (char *)0, 0L, last); | ||
|
|
||
| /* Replace the lengths in the dummy stored block with len. */ | ||
| - s->pending_buf[s->pending - 4] = len; | ||
| - s->pending_buf[s->pending - 3] = len >> 8; | ||
| - s->pending_buf[s->pending - 2] = ~len; | ||
| - s->pending_buf[s->pending - 1] = ~len >> 8; | ||
| + s->pending_buf[s->pending - 4] = (Bytef)len; | ||
| + s->pending_buf[s->pending - 3] = (Bytef)(len >> 8); | ||
| + s->pending_buf[s->pending - 2] = (Bytef)~len; | ||
| + s->pending_buf[s->pending - 1] = (Bytef)(~len >> 8); | ||
|
|
||
| /* Write the stored block header bytes. */ | ||
| flush_pending(s->strm); | ||
| diff --git a/src/native/external/zlib/trees.c b/src/native/external/zlib/trees.c | ||
| index 5f305c47221..8a3eec559e5 100644 | ||
| --- a/src/native/external/zlib/trees.c | ||
| +++ b/src/native/external/zlib/trees.c | ||
| @@ -721,7 +721,7 @@ local void scan_tree(s, tree, max_code) | ||
| if (++count < max_count && curlen == nextlen) { | ||
| continue; | ||
| } else if (count < min_count) { | ||
| - s->bl_tree[curlen].Freq += count; | ||
| + s->bl_tree[curlen].Freq += (ush)count; | ||
| } else if (curlen != 0) { | ||
| if (curlen != prevlen) s->bl_tree[curlen].Freq++; | ||
| s->bl_tree[REP_3_6].Freq++; | ||
| -- | ||
| 2.42.0.windows.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,9 @@ | ||
| v1.2.13 | ||
| (04f42ceca40f73e2978b50e93806c2a18c1281fc) | ||
| v1.3.1 | ||
| (51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf) | ||
|
|
||
| https://github.com/madler/zlib/releases/tag/v1.2.13 | ||
| https://github.com/madler/zlib/releases/tag/v1.3.1 | ||
|
|
||
| We have removed zlib.3.pdf from our local copy, as it is a binary file which is | ||
| not needed for our compilation. | ||
|
|
||
| We have also cherry-picked into our local copy: | ||
|
|
||
| - https://github.com/madler/zlib/commit/e554695638228b846d49657f31eeff0ca4680e8a | ||
|
|
||
| This patch only affects memLevel 9 compression. .NET doesn't currently use this | ||
| memLevel, but we'll take this patch out of an abundance of caution just in case | ||
| we enable this functionality in a future release. | ||
| We have also applied the custom patches under the patches/zlib folder. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.