Set version in ZIP local header to ZIP64 when file offset is >4GB #102053
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stephentoub
reviewed
May 15, 2024
src/libraries/System.IO.Compression/src/System/IO/Compression/ZipArchiveEntry.cs
Outdated
Show resolved
Hide resolved
stephentoub
reviewed
May 15, 2024
src/libraries/System.IO.Compression/tests/ZipArchive/zip_LargeFiles.cs
Outdated
Show resolved
Hide resolved
stephentoub
approved these changes
May 15, 2024
danmoseley
reviewed
May 15, 2024
src/libraries/System.IO.Compression/tests/ZipArchive/zip_LargeFiles.cs
Outdated
Show resolved
Hide resolved
ZipArchiveEntry didn't set ZIP64 in local headers for small files if their offset are >4GB.
…as outerloop and disable parallelization.
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9324124718 |
|
@carlossanlop backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Check LH offset when writing LH. Fix #94899
Applying: added test
Applying: added comment
Applying: move conditions into methods
error: sha1 information is lacking or useless (src/libraries/System.IO.Compression/src/System/IO/Compression/ZipArchiveEntry.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 move conditions into methods
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@carlossanlop an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
carlossanlop
added a commit
to carlossanlop/runtime
that referenced
this pull request
Jun 3, 2024
…tnet#102053) * ZipArchiveEntry didn't set ZIP64 in local headers for small files if their offset are > 4GB. * Added System.IO.Compression and System.IO.Packaging tests. --------- Co-authored-by: Gan Keyu <[email protected]>
carlossanlop
added a commit
to carlossanlop/runtime
that referenced
this pull request
Jun 5, 2024
…tnet#102053) * ZipArchiveEntry didn't set ZIP64 in local headers for small files if their offset are > 4GB. * Added System.IO.Compression and System.IO.Packaging tests. --------- Co-authored-by: Gan Keyu <[email protected]>
carlossanlop
added a commit
that referenced
this pull request
Jun 10, 2024
…02053) (#103006) * ZipArchiveEntry didn't set ZIP64 in local headers for small files if their offset are > 4GB. * Added System.IO.Compression and System.IO.Packaging tests. --------- Co-authored-by: Gan Keyu <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Original PR by @karakasa #94970
The current code changes have already been reviewed in the old PR. The only thing left to do is adding a test for System.IO.Packaging to confirm the original reported issue is fixed.
cc @llali