Fix UB found by libASAN build

ComputationalBiomechanicsLab · Jul 29, 2024 · 626bf0f · 626bf0f
1 parent 6bd26d9
commit 626bf0f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/oscar/Graphics/GraphicsImplementation.cpp b/src/oscar/Graphics/GraphicsImplementation.cpp
@@ -4923,8 +4923,14 @@ class osc::Mesh::Impl final {
     {
         indices_are_32bit_ = false;
         num_indices_ = indices.size();
-        indices_data_.resize((indices.size()+1)/2);
-        rgs::copy(indices, &indices_data_.front().u16.a);
+
+        if (not indices.empty()) {
+            indices_data_.resize((indices.size()+1)/2);
+            rgs::copy(indices, &indices_data_.front().u16.a);
+        }
+        else {
+            indices_data_.clear();
+        }
 
         range_check_indices_and_recalculate_bounds(flags);
         version_->reset();

diff --git a/tests/testoscar/Graphics/TestMesh.cpp b/tests/testoscar/Graphics/TestMesh.cpp
@@ -809,6 +809,24 @@ TEST(Mesh, SetIndicesThrowsIfOutOfBounds)
     ASSERT_ANY_THROW({ m.set_indices(iota_index_range(3, 6)); }) << "should throw: indices are out-of-bounds";
 }
 
+TEST(Mesh, SetIndices16BitWorksWithEmptyVector)
+{
+    std::vector<uint16_t> indices;
+    Mesh m;
+    m.set_vertices(generate_vertices(3));
+    m.set_indices(indices);  // should just work
+    ASSERT_TRUE(m.indices().empty());
+}
+
+TEST(Mesh, SetIndices32BitWorksWithEmptyVector)
+{
+    std::vector<uint32_t> indices;
+    Mesh m;
+    m.set_vertices(generate_vertices(3));
+    m.set_indices(indices);  // should just work
+    ASSERT_TRUE(m.indices().empty());
+}
+
 TEST(Mesh, SetIndiciesWithDontValidateIndicesAndDontRecalculateBounds)
 {
     Mesh m;