Handle errors in jl_image_unpack_zstd better, especially on Windows #59773
Conversation
This file contains hidden or 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
topolarity
approved these changes
Oct 8, 2025
| if (fail) { | ||
| const char *err; | ||
| #if defined(_OS_WINDOWS_) | ||
| char err_buf[256]; |
There was a problem hiding this comment.
256 bytes seems a bit conservative - maybe double it?
Also looking at the implementation of win32_formatmessage, it looks like it leaves err_buf mostly uninitialized if the buffer is too small. That could probably do with a quick fix-up.
There was a problem hiding this comment.
GitHub just showed me the approval but not any of the review comments. Woops. I'll have to do this in another PR but I expect to have to touch this code soon anyway.
gbaraldi
pushed a commit
that referenced
this pull request
Oct 9, 2025
…59773) Handle a failed allocation in `jl_image_unpack_zstd` better: - On Windows, if `GetLargePageMinimum()` reports that large pages are unsupported, don't try to allocate with `MEM_LARGE_PAGES`. - If they are supported but the large page allocation fails, try again without the option. - On all platforms, provide a better error message when the allocation fails. Ported from #59340.
gbaraldi
pushed a commit
that referenced
this pull request
Oct 9, 2025
…59773) Handle a failed allocation in `jl_image_unpack_zstd` better: - On Windows, if `GetLargePageMinimum()` reports that large pages are unsupported, don't try to allocate with `MEM_LARGE_PAGES`. - If they are supported but the large page allocation fails, try again without the option. - On all platforms, provide a better error message when the allocation fails. Ported from #59340.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Handle a failed allocation in
jl_image_unpack_zstdbetter:GetLargePageMinimum()reports that large pages are unsupported, don't try to allocate withMEM_LARGE_PAGES.Ported from #59340.