[zstd] Fix unneededly allocate large decompression buffer #120
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
|
LGTM |
david-ds
reviewed
Jun 6, 2022
| @@ -67,11 +67,14 @@ func decompressSizeHint(src []byte) int { | |||
| } | |||
|
|
|||
| hint := upperBound | |||
| if len(src) >= zstdFrameHeaderSizeMax { | |||
| if len(src) >= zstdFrameHeaderSizeMin { | |||
There was a problem hiding this comment.
why not check the upper bound as well?
len(src) >= zstdFrameHeaderSizeMin && len(src) <= zstdFrameHeaderSizeMaxThere was a problem hiding this comment.
I'm not sure what you mean ? That check if just to make sure the header is in the payload but src will 99% of the time be bigger than zstdFrameHeaderSizeMax (and that's fine)
There was a problem hiding this comment.
👍 sorry I thought that src would only be the header, I didn't realize it was the full payload.
david-ds
approved these changes
Jun 6, 2022
|
Thanks for the report @XiaochenCui ! I'm still looking at #117 and once it's ready, I'll cut a new release |
Sure thing! It feels great to contribute to the open-source community. |
kodiakhq bot
referenced
this pull request
in cloudquery/cloudquery
Jan 1, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/DataDog/zstd](https://github.com/DataDog/zstd) | indirect | patch | `v1.5.0` -> `v1.5.2` | --- ### Release Notes <details> <summary>DataDog/zstd</summary> ### [`v1.5.2`](https://github.com/DataDog/zstd/releases/tag/v1.5.2): zstd 1.5.2 [Compare Source](https://github.com/DataDog/zstd/compare/v1.5.2...v1.5.2) This release updates the upstream zstd version to [1.5.2](https://github.com/facebook/zstd/releases/tag/v1.5.2) ([https://github.com/DataDog/zstd/pull/116](https://github.com/DataDog/zstd/pull/116)) The update `1.5.0` -> `1.5.2` overall has a similar performance profile. Please note that depending on the workload, performance could vary by -10% / +10% ### [`v1.5.2+patch1`](https://github.com/DataDog/zstd/releases/tag/v1.5.2%2Bpatch1): zstd 1.5.2 - wrapper patches 1 [Compare Source](https://github.com/DataDog/zstd/compare/v1.5.0...v1.5.2) #### What's Changed - Fix unneededly allocated large decompression buffer by [@​XiaochenCui](https://github.com/XiaochenCui) ([#​118](https://github.com/DataDog/zstd/issues/118)) & [@​Viq111](https://github.com/Viq111) in [https://github.com/DataDog/zstd/pull/120](https://github.com/DataDog/zstd/pull/120) - Add SetNbWorkers api to the writer code (see [#​108](https://github.com/DataDog/zstd/issues/108)) by [@​bsergean](https://github.com/bsergean) in [https://github.com/DataDog/zstd/pull/117](https://github.com/DataDog/zstd/pull/117) - For large workloads, the performance can be improved by 3-6x (see [https://github.com/DataDog/zstd/pull/117#issuecomment-1147812767](https://github.com/DataDog/zstd/pull/117#issuecomment-1147812767)) - `Write()` becomes async with workers > 1, make sure you read the method documentation before using #### New Contributors - [@​bsergean](https://github.com/bsergean) made their first contribution in [https://github.com/DataDog/zstd/pull/117](https://github.com/DataDog/zstd/pull/117) - [@​XiaochenCui](https://github.com/XiaochenCui) for his work on [https://github.com/DataDog/zstd/pull/118](https://github.com/DataDog/zstd/pull/118) that led to [#​120](https://github.com/DataDog/zstd/issues/120) **Full Changelog**: DataDog/zstd@v1.5.2...v1.5.2+patch1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 3am 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:eyJjcmVhdGVkSW5WZXIiOiIzNC43Ny4wIiwidXBkYXRlZEluVmVyIjoiMzQuNzcuMCJ9-->
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.
Fix #118
With the introduction of #115 to prevent zipbombs, the check was too strict and was checking a too large size boundary. This fixes it and adds a test
Thanks to @XiaochenCui for reporting