Prevent crash from importing a certain kind of invalid GLTF #83663
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
invalid type: mistach interpolation CUBICSPLINE and value size
fire
approved these changes
Oct 20, 2023
There was a problem hiding this comment.
I am not at a computer but the code moves the ternary operator outside indexing operator and adds a check for error. Checked the pattern seems ok but haven’t tested with data. The cubic gltf interpolation is a bit rare and need to check a test case.
Will cause error spam on for example thousands of animation tracks. try printing once
| @@ -6224,7 +6224,9 @@ void GLTFDocument::_import_animation(Ref<GLTFState> p_state, AnimationPlayer *p_ | |||
| if (p_remove_immutable_tracks) { | |||
| Vector3 base_pos = p_state->nodes[track_i.key]->position; | |||
| for (int i = 0; i < track.position_track.times.size(); i++) { | |||
| Vector3 value = track.position_track.values[track.position_track.interpolation == GLTFAnimation::INTERP_CUBIC_SPLINE ? (1 + i * 3) : i]; | |||
| int value_index = track.position_track.interpolation == GLTFAnimation::INTERP_CUBIC_SPLINE ? (1 + i * 3) : i; | |||
There was a problem hiding this comment.
Suggested change
| int value_index = track.position_track.interpolation == GLTFAnimation::INTERP_CUBIC_SPLINE ? (1 + i * 3) : i; | |
| int value_index = (track.position_track.interpolation == GLTFAnimation::INTERP_CUBIC_SPLINE) ? (1 + i * 3) : i; |
For readability, same below
There was a problem hiding this comment.
My bad, was preparing a batch of approved PRs and I missed this comment.
|
Thanks! |
akien-mga
changed the title
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.
Invalid type: mistach interpolation CUBICSPLINE and value size. Might need to change the description and maybe more protections are needed.
Fixes #83617