[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 3 commits into from
Sep 14, 2023
Merged

[release/8.0] Remove implicit narrowing conversions from zlib #91962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f329f40
Make zlib compile clean against MSVC C4244 and clang implicit-int-con…
GrabYourPitchforks Aug 28, 2023
92c21b4
Unbreak mono build
GrabYourPitchforks Aug 29, 2023
6274976
Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0
carlossanlop Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/mono/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
endif()

# FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down
75 changes: 75 additions & 0 deletions ...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
src/native/external/zlib-intel/deflate.c | 8 ++++----
src/native/external/zlib-intel/slide_sse.c | 2 +-
src/native/external/zlib-intel/trees.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
unsigned n;
Posf *p;
uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

n = s->hash_size;
p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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

57 changes: 57 additions & 0 deletions src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch
View file
Open in desktop
Original file line numberDiff line numberDiff 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

2 changes: 2 additions & 0 deletions src/native/external/zlib-intel-version.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.
6 changes: 0 additions & 6 deletions src/native/external/zlib-intel.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
adler32.c
compress.c
Expand Down
8 changes: 4 additions & 4 deletions src/native/external/zlib-intel/deflate.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down
2 changes: 1 addition & 1 deletion src/native/external/zlib-intel/slide_sse.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
unsigned n;
Posf *p;
uInt wsize = s->w_size;
z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

n = s->hash_size;
p = &s->head[n] - 8;
Expand Down
2 changes: 1 addition & 1 deletion src/native/external/zlib-intel/trees.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down
2 changes: 2 additions & 0 deletions src/native/external/zlib-version.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
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.
6 changes: 0 additions & 6 deletions src/native/external/zlib.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
adler32.c
compress.c
Expand Down
8 changes: 4 additions & 4 deletions src/native/external/zlib/deflate.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/native/external/zlib/trees.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/8.0] Remove implicit narrowing conversions from zlib#91962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 3 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Remove implicit narrowing conversions from zlib
#91962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f329f40

Make zlib compile clean against MSVC C4244 and clang implicit-int-con…


GrabYourPitchforks Aug 28, 2023
92c21b4

Unbreak mono build


GrabYourPitchforks Aug 29, 2023
6274976

Merge branch 'release/8.0' into backport/pr-91245-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
src/mono/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,9 @@ if (MSVC)
 if(EXISTS ${CLR_SOURCELINK_FILE_PATH})
 add_link_options("/sourcelink:${CLR_SOURCELINK_FILE_PATH}")
 endif()

 # FIXME: Remove the line below when https://github.com/dotnet/runtime/issues/91249 is fixed.
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
endif(MSVC)

set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
Expand Down

75 changes: 75 additions & 0 deletions
...native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
From edabaf799fd071a328e0adb743a98628df6649f0 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-intel 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.

The change to slide_sse.c is legal because 'w_size' is limited to
1 << 15 (see deflateInit2_ in deflate.c), so this fits cleanly into
a 16-bit value.
---
 src/native/external/zlib-intel/deflate.c | 8 ++++----
 src/native/external/zlib-intel/slide_sse.c | 2 +-
 src/native/external/zlib-intel/trees.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/native/external/zlib-intel/deflate.c b/src/native/external/zlib-intel/deflate.c
index bd5e95774a6..108b1a187af 100644
--- a/src/native/external/zlib-intel/deflate.c
+++ b/src/native/external/zlib-intel/deflate.c
@@ -1553,10 +1553,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-intel/slide_sse.c b/src/native/external/zlib-intel/slide_sse.c
index 342fd562dd1..eb74202c5a0 100644
--- a/src/native/external/zlib-intel/slide_sse.c
+++ b/src/native/external/zlib-intel/slide_sse.c
@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
- z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
+ z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
diff --git a/src/native/external/zlib-intel/trees.c b/src/native/external/zlib-intel/trees.c
index 35462a1313a..f78b7d8c63e 100644
--- a/src/native/external/zlib-intel/trees.c
+++ b/src/native/external/zlib-intel/trees.c
@@ -717,7 +717,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


57 changes: 57 additions & 0 deletions
src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

View file


Open in desktop

Original file line numberDiff line numberDiff 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


2 changes: 2 additions & 0 deletions
src/native/external/zlib-intel-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,5 @@ copied into our repo in order to build. Since then, we've just updated only
those files in-place, ignoring other files in the intel/zlib repo. If new files
are introduced which are necessary for building the product, feel free to bring
those down as well.

We have also applied the custom patches under the patches/zlib-intel folder.

6 changes: 0 additions & 6 deletions
src/native/external/zlib-intel.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib-intel/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1553,10 +1553,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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/slide_sse.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ void slide_hash_sse(deflate_state *s)
 unsigned n;
 Posf *p;
 uInt wsize = s->w_size;
 z_const __m128i xmm_wsize = _mm_set1_epi16(s->w_size);
 z_const __m128i xmm_wsize = _mm_set1_epi16((short)s->w_size);

 n = s->hash_size;
 p = &s->head[n] - 8;
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib-intel/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -717,7 +717,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++;
Expand Down

2 changes: 2 additions & 0 deletions
src/native/external/zlib-version.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,3 +13,5 @@ We have also cherry-picked into our local copy:
 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.

6 changes: 0 additions & 6 deletions
src/native/external/zlib.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
if(MSVC)
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4244>) # conversion from 'type1' to 'type2', possible loss of data
else(CMAKE_C_COMPILER_ID MATCHES "Clang")
 add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-int-conversion>)
endif()

set(ZLIB_SOURCES_BASE
 adler32.c
 compress.c
Expand Down

8 changes: 4 additions & 4 deletions
src/native/external/zlib/deflate.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
Expand Down

2 changes: 1 addition & 1 deletion
src/native/external/zlib/trees.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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++;
Expand Down