Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } 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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

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

Fix DeflateEncoder.GetMaxCompressedLength conservative bound#132274

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
BrzVlad merged 1 commit into from
Aug 17, 2026
Merged

Fix DeflateEncoder.GetMaxCompressedLength conservative bound #132274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/IO/Compression/EncoderDecoderTestBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -688,7 +688,6 @@ public void RoundTrip_AllCompressionLevels()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/127563", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void RoundTrip_AllWindowLogs()
{
byte[] input = CreateTestData();
Expand Down
32 changes: 9 additions & 23 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/DeflateEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,30 +144,16 @@ public static long GetMaxCompressedLength(long inputLength)
{
ArgumentOutOfRangeException.ThrowIfNegative(inputLength);

// For inputs up to 2 GiB, delegate to the native compressBound() function, which returns
// the exact upper bound for the zlib implementation linked into the current process
// (either classic zlib or zlib-ng, depending on platform and build flags). The 2^31
// threshold keeps the value within the uint P/Invoke signature on all platforms.

// Browser/WASI builds do not link the native compression library,
// so fall through to the managed formula on those platforms.
if (inputLength <= (1L << 31) && !OperatingSystem.IsBrowser() && !OperatingSystem.IsWasi())
{
return Interop.ZLib.compressBound((uint)inputLength);
}

// For larger inputs, compute the bound in managed code using zlib-ng's quick-strategy
// formula. It is strictly larger than classic zlib's compressBound(), so it is a safe
// upper bound regardless of which implementation is linked at runtime.
// See: src/native/external/zlib-ng/compress.c and zutil.h.
// Use ulong to avoid overflow; reject inputs whose bound does not fit in long.
// This method does not know which windowLog2 or quality the caller will use, so
// compute the maximum of the bounds used by zlib-ng's deflateBound(). The code below mimics the logic
// to compute the maximum possible size returned by deflateBound. Our API doesn't expose all knobs
// so z_stream's strstart and gzhead are always null. We also don't handle the s390 corner case.
ulong sourceLength = (ulong)inputLength;
ulong maxCompressedLength = sourceLength
+ (sourceLength == 0 ? 1u : 0u)
+ (sourceLength < 9 ? 1u : 0u)
+ ((sourceLength + 7) >> 3)
+ 3 // DEFLATE_BLOCK_OVERHEAD: (3 + 15 + 6) >> 3
+ 6; // ZLIB_WRAPLEN: zlib header (2 bytes) + Adler32 trailer (4 bytes)
const ulong wrapLength = 6; // GZIP_WRAPLEN is 18, GZipEncoder compensates for the rest
ulong maxCompressedLength = sourceLength + ((sourceLength + 7) >> 3) + ((sourceLength + 63) >> 6) + 5;
ulong storedBlockBound = sourceLength + (sourceLength >> 5) + (sourceLength >> 7) + (sourceLength >> 11) + 7;
Comment thread
BrzVlad marked this conversation as resolved.

maxCompressedLength = Math.Max(maxCompressedLength, storedBlockBound) + wrapLength;

if (maxCompressedLength > long.MaxValue)
{
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/GZipEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate, which includes
// 6 bytes of zlib overhead (2-byte header + 4-byte Adler32 trailer).
// GZip format uses 18 bytes of overhead (10-byte header + 8-byte CRC32/size trailer),
// which is 12 bytes more than the zlib overhead already included in compressBound().
// DeflateEncoder.GetMaxCompressedLength() returns the bound for zlib-wrapped deflate,
// where wrap length is at most 6 bytes. GZip format uses 18 bytes of overhead, which is
// 12 bytes more than the conservative zlib overhead already included in that bound.
long maxCompressedLength = DeflateEncoder.GetMaxCompressedLength(inputLength);

if (maxCompressedLength > long.MaxValue - 12)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO.Compression/src/System/IO/Compression/ZLibEncoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,9 +78,9 @@ private void EnsureNotDisposed()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="inputLength"/> is negative.</exception>
public static long GetMaxCompressedLength(long inputLength)
{
// compressBound() returns the upper bound for zlib-wrapped deflate output, which already
// DeflateEncoder.GetMaxCompressedLength() returns a bound for deflate output that already
// accounts for zlib's 2-byte header and 4-byte Adler32 trailer. ZLibEncoder produces
// zlib-format output, so this value is the exact upper bound with no additional overhead needed.
// zlib-format output, so this value is a valid upper bound with no additional overhead needed.
return DeflateEncoder.GetMaxCompressedLength(inputLength);
}

Expand Down
Loading