Fix ZipArchiveFuzzer assertion failure in Zip64EndOfCentralDirectoryLocator.TryReadBlock #118230
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a debug assertion failure discovered by the ZipArchiveFuzzer when processing malformed ZIP files with truncated Zip64 End of Central Directory Locator blocks.
Problem
The assertion failure occurred in
Zip64EndOfCentralDirectoryLocator.TryReadBlock()with the message:The issue was that the code assumed if
ZipHelper.SeekBackwardsToSignature()successfully found a Zip64 EOCD Locator signature, then the complete block must be readable. However, malformed or truncated ZIP files (like those generated by fuzzers) can contain valid 4-byte signatures but insufficient remaining data to read the full block structure.Solution
Replaced the problematic
Debug.Assertwith proper error handling that throws anInvalidDataExceptionwhen the block cannot be read completely. This change was applied to both the synchronous and asynchronous versions of the method:Zip64EndOfCentralDirectoryLocator.TryReadBlock()inZipBlocks.csZip64EndOfCentralDirectoryLocator.TryReadBlockAsync()inZipBlocks.Async.csTesting
ZipArchive_FuzzerCrashInput_Zip64EOCDLocatorInsufficientDatathat reproduces the original crash inputThe fix ensures that malformed ZIP files are handled gracefully with proper error reporting rather than triggering assertion failures in debug builds.
Fixes #117147.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.