Skip to content
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.

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

fix: (#33) Rare combination of settings could lead to writing a corrupt archive with overlength extra data, and data_start locations when reading the archive back were also wrong #221

Merged
merged 40 commits into from
Jul 29, 2024

Conversation

Pr0methean
Copy link
Member

@Pr0methean Pr0methean commented Jul 20, 2024

The reason this PR is so big is because we're changing how the total extra-data size is counted and how the extra data is stored; previously it didn't include the ZIP64 header or alignment padding, but now it does.

@Pr0methean Pr0methean added the waiting to be automatically merged If this PR isn't automatically merged, suspect a broader issue. label Jul 20, 2024
@Pr0methean Pr0methean disabled auto-merge July 20, 2024 05:06
@Pr0methean Pr0methean added help wanted Extra attention is needed Please fix failing tests Tests are failing with this change; please fix them. and removed waiting to be automatically merged If this PR isn't automatically merged, suspect a broader issue. labels Jul 20, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Jul 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jul 28, 2024
Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
@Pr0methean Pr0methean changed the title fix: Rare combination of settings could lead to writing a corrupt archive with overlength extra data fix: (#33) Rare combination of settings could lead to writing a corrupt archive with overlength extra data or reading back the data_start location incorrectly Jul 28, 2024
@Pr0methean Pr0methean changed the title fix: (#33) Rare combination of settings could lead to writing a corrupt archive with overlength extra data or reading back the data_start location incorrectly fix: (#33) Rare combination of settings could lead to writing a corrupt archive with overlength extra data, and data_start locations when reading the archive back were also wrong Jul 29, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Jul 29, 2024
Merged via the queue into master with commit 6d8ab62 Jul 29, 2024
45 checks passed
@Pr0methean Pr0methean deleted the fix-fuzz-2024-07-17 branch July 29, 2024 07:07
This was referenced Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
help wanted Extra attention is needed Please fix failing tests Tests are failing with this change; please fix them.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant