Fix error when loading SVG imported as Image #90573
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
approved these changes
Apr 12, 2024
akien-mga
added
bug
topic:import
cherrypick:4.2
fire
reviewed
Apr 12, 2024
| @@ -173,9 +173,17 @@ void ImageLoaderSVG::get_recognized_extensions(List<String> *p_extensions) const | |||
| } | |||
|
|
|||
| Error ImageLoaderSVG::load_image(Ref<Image> p_image, Ref<FileAccess> p_fileaccess, BitField<ImageFormatLoader::LoaderFlags> p_flags, float p_scale) { | |||
| String svg = p_fileaccess->get_as_utf8_string(); | |||
| const uint64_t len = p_fileaccess->get_length() - p_fileaccess->get_position(); | |||
| Vector<uint8_t> buffer; | |||
There was a problem hiding this comment.
I don't think it's possible to have length < -1 or >= p_fileaccess->get_length(), so we don't need a err index check but..
There was a problem hiding this comment.
However it is missing is_null checks on the inputs.
There was a problem hiding this comment.
Which input do you mean? Null checks for p_image and p_fileaccess are done at ImageLoader::load_image() level.
|
Thanks! |
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.
If an SVG file is imported as Image, trying to open it in the editor produces these error:
It's because
get_as_utf8_string()is used to load SVG string. This method expects a brand newFileAccess, however for anImage, a header is already stripped from file content. So this PR reads the rest of the file manually.