Fix decompression functions not returning errcodes #58278
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
akien-mga
reviewed
Feb 18, 2022
core/io/file_access_compressed.cpp
Outdated
| @@ -305,7 +308,8 @@ uint64_t FileAccessCompressed::get_buffer(uint8_t *p_dst, uint64_t p_length) con | |||
| if (read_block < read_block_count) { | |||
| //read another block of compressed data | |||
| f->get_buffer(comp_buffer.ptrw(), read_blocks[read_block].csize); | |||
| Compression::decompress(buffer.ptrw(), read_blocks.size() == 1 ? read_total : block_size, comp_buffer.ptr(), read_blocks[read_block].csize, cmode); | |||
| int err = Compression::decompress(buffer.ptrw(), read_blocks.size() == 1 ? read_total : block_size, comp_buffer.ptr(), read_blocks[read_block].csize, cmode); | |||
There was a problem hiding this comment.
Should be ret for consistency with other checks.
akien-mga
added
bug
cherrypick:3.x
akien-mga
reviewed
Feb 18, 2022
core/io/file_access_compressed.cpp
Outdated
| @@ -125,10 +125,11 @@ Error FileAccessCompressed::_open(const String &p_path, int p_mode_flags) { | |||
| char rmagic[5]; | |||
| f->get_buffer((uint8_t *)rmagic, 4); | |||
| rmagic[4] = 0; | |||
| if (magic != rmagic || open_after_magic(f) != OK) { | |||
| Error err = ERR_FILE_UNRECOGNIZED; | |||
There was a problem hiding this comment.
Shadows previous err:
Suggested change
| Error err = ERR_FILE_UNRECOGNIZED; | |
| err = ERR_FILE_UNRECOGNIZED; |
akien-mga
reviewed
Feb 18, 2022
core/io/file_access_compressed.cpp
Outdated
Comment on lines
278
to
279
| int ret = Compression::decompress(buffer.ptrw(), read_blocks.size() == 1 ? read_total : block_size, comp_buffer.ptr(), read_blocks[read_block].csize, cmode); | ||
| ERR_FAIL_COND_V_MSG(ret == -1, 0, "Compressed file is corrupt."); |
There was a problem hiding this comment.
This shadows ret which is actually the decompression result.
There was a problem hiding this comment.
Fixed, I picked total as a more sensible name than err for this one.
rsubtil
force-pushed
the
fix_decompress_retcode
branch
from
cf6bbfb
to
61790a0
Compare
akien-mga
approved these changes
Feb 18, 2022
|
Thanks! |
|
Cherry-picked for 3.5. |
akien-mga
removed
the
cherrypick:3.x
|
Cherry-picked for 3.4.3. |
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.
Compression::decompressreturns -1 on error scenarios. This was not being propagated to let the user know there was an error while reading compressed files.Fixes #57049