Skip to content

Fix missing return in SceneUtils::InstantiateMesh error path #1217

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rootkiller6788 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Fix missing return in SceneUtils::InstantiateMesh error path #1217

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/draco/scene/scene_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ StatusOr<std::unique_ptr<Mesh>> SceneUtils::InstantiateMesh(
const Scene &scene, const MeshInstance &instance) {
// Check if the |scene| has base mesh corresponding to mesh |instance|.
if (scene.NumMeshes() <= instance.mesh_index.value()) {
Status(Status::DRACO_ERROR, "Scene has no corresponding base mesh.");
return Status(Status::DRACO_ERROR, "Scene has no corresponding base mesh.");
}

// Check that mesh has valid positions.
Expand Down
12 changes: 12 additions & 0 deletions src/draco/scene/scene_utils_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,18 @@ TEST(SceneUtilsTest, TestInstantiateMesh) {
EXPECT_NEAR(instanced_bbox.GetMaxPoint()[2], +1.05800, tolerance);
}

TEST(SceneUtilsTest, TestInstantiateMeshWithInvalidMeshIndex) {
// Instantiating a mesh with an index that is not present in the scene must
// return an error instead of accessing the out-of-bounds mesh.
draco::Scene scene;
const draco::SceneUtils::MeshInstance invalid_instance = {
draco::MeshIndex(0), draco::SceneNodeIndex(0), 0,
Eigen::Matrix4d::Identity()};
const auto result =
draco::SceneUtils::InstantiateMesh(scene, invalid_instance);
EXPECT_FALSE(result.ok());
}

TEST(SceneUtilsTest, TestCleanupEmptyMeshGroup) {
auto scene =
draco::ReadSceneFromTestFile("CesiumMilkTruck/glTF/CesiumMilkTruck.gltf");
Expand Down