Skip to content

Fix index out of bounds panic in glTF animation export #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
null-port wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix index out of bounds panic in glTF animation export #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/convert/gltf/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,10 @@ fn animations(ctx: &Ctx, gltf: &mut GlTF) {
_ => continue,
};

let curves = &object_curves[object_idx as usize];
let curves = match object_curves.get(object_idx as usize) {
Some(c) => c,
None => continue, // no animation data for this object
};

// Add channels for any of the TRSs that are animated for this
// object
Expand Down Expand Up @@ -576,7 +579,7 @@ fn animations(ctx: &Ctx, gltf: &mut GlTF) {
// Now use the sampler descriptions to write the actual samplers
let samplers = sampler_descs.iter().map(|desc| {
let &SamplerDescriptor { object_idx, path } = desc;
let curves = &object_curves[object_idx as usize];
let curves = &object_curves[object_idx as usize]; // safe: only indices that passed bounds check above are in sampler_descs

let domain = match path {
SamplerPath::Translation => curves.translation.domain(),
Expand Down