fix: package hash bug #17094
Closed
fix: package hash bug #17094
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
This is not the best fix as it duplicates code.
squeek502
reviewed
Sep 8, 2023
| .handle = iterable_dir.dir, | ||
| }; | ||
| }; | ||
| defer tmp_directory.closeAndFree(gpa); |
There was a problem hiding this comment.
Won't this double closeAndFree tmp_directory (since the original defer is still active)? And the first tmp_directory won't ever be closeAndFreed?
| @@ -608,6 +608,20 @@ fn fetchAndUnpack( | |||
| // I have not checked what buffer sizes the xz decompression implementation uses | |||
| // by default, so the same logic applies for buffering the reader as for gzip. | |||
| try unpackTarball(gpa, prog_reader.reader(), tmp_directory.handle, std.compress.xz); | |||
|
|
|||
| tmp_directory = d: { | |||
There was a problem hiding this comment.
Why only reopen in the application/x-xz case? Wouldn't this affect all the other cases too?
| @@ -608,6 +608,20 @@ fn fetchAndUnpack( | |||
| // I have not checked what buffer sizes the xz decompression implementation uses | |||
| // by default, so the same logic applies for buffering the reader as for gzip. | |||
| try unpackTarball(gpa, prog_reader.reader(), tmp_directory.handle, std.compress.xz); | |||
|
|
|||
| tmp_directory = d: { | |||
There was a problem hiding this comment.
Definitely need an explainer comment detailing why this is needed (and that it's effectively a workaround for a potential IterableDir.Iterator/Walker bug).
|
cleaner workaround coming as part of #17392 |
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.
This is not the best fix atm as it duplicates code.
See #17064