zstd: Fix corrupted output in "best" #876
Merged
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
Regression from #784 and followup #793 Fixes #875 A 0 offset backreference was possible when "improve" was successful twice in a row in the "skipBeginning" part, only finding 2 (previously unmatches) length 4 matches, but where start offset decreased by 2 in both cases. This would result in output where the end offset would equal to the next 's', thereby doing a self-reference. Add a general check in "improve" and just reject these. Will also guard against similar issues in the future. This also hints at some potentially suboptimal hash indexing - but I will take that improvement separately. Fuzz test set updated.
kodiakhq bot
referenced
this pull request
in cloudquery/filetypes
Nov 1, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/klauspost/compress](https://github.com/klauspost/compress) | indirect | patch | `v1.17.0` -> `v1.17.2` | --- ### Release Notes <details> <summary>klauspost/compress (github.com/klauspost/compress)</summary> ### [`v1.17.2`](https://github.com/klauspost/compress/releases/tag/v1.17.2) [Compare Source](https://github.com/klauspost/compress/compare/v1.17.1...v1.17.2) #### What's Changed - zstd: Fix corrupted output in "best" by [@​klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/876](https://github.com/klauspost/compress/pull/876) **Full Changelog**: klauspost/compress@v1.17.1...v1.17.2 ### [`v1.17.1`](https://github.com/klauspost/compress/releases/tag/v1.17.1) [Compare Source](https://github.com/klauspost/compress/compare/v1.17.0...v1.17.1) #### What's Changed - s2: Fix S2 "best" dictionary wrong encoding by [@​klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/871](https://github.com/klauspost/compress/pull/871) - flate: Reduce allocations in decompressor and minor code improvements by [@​fakefloordiv](https://github.com/fakefloordiv) in [https://github.com/klauspost/compress/pull/869](https://github.com/klauspost/compress/pull/869) - s2: Fix EstimateBlockSize on 6&7 length input by [@​klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/867](https://github.com/klauspost/compress/pull/867) - tests: Fuzzing Coverage Expansion by [@​viktoriia-lsg](https://github.com/viktoriia-lsg) in [https://github.com/klauspost/compress/pull/866](https://github.com/klauspost/compress/pull/866) - tests: Set FSE decompress fuzzer max limit by [@​klauspost](https://github.com/klauspost) in [https://github.com/klauspost/compress/pull/868](https://github.com/klauspost/compress/pull/868) - tests: Fuzzing Coverage Expansion ([#​2](https://github.com/klauspost/compress/issues/2)) by [@​viktoriia-lsg](https://github.com/viktoriia-lsg) in [https://github.com/klauspost/compress/pull/870](https://github.com/klauspost/compress/pull/870) #### New Contributors - [@​viktoriia-lsg](https://github.com/viktoriia-lsg) made their first contribution in [https://github.com/klauspost/compress/pull/866](https://github.com/klauspost/compress/pull/866) - [@​fakefloordiv](https://github.com/fakefloordiv) made their first contribution in [https://github.com/klauspost/compress/pull/869](https://github.com/klauspost/compress/pull/869) **Full Changelog**: klauspost/compress@v1.17.0...v1.17.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDkuNCIsInVwZGF0ZWRJblZlciI6IjM2LjEwOS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Regression from #784 and followup #793
Fixes #875
A 0 offset backreference was possible when "improve" was successful twice in a row in the "skipBeginning" part, only finding 2 (previously unmatched) length 4 matches, but where start offset decreased by 2 in both cases.
This would result in output where the end offset would equal to the next 's', thereby doing a self-reference.
Add a general check in "improve" and just reject these. Will also guard against similar issues in the future.
This also hints at some potentially suboptimal hash indexing - but I will take that improvement separately.
Fuzz test set updated.