Merge branch 'main' into bhata/updateCatch

Signed-off-by: Jonathan Stone <[email protected]>
autodesk-forks · Oct 24, 2023 · 19238c4 · 19238c4
2 parents ea91fc1 + a5b832d
commit 19238c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/source/MaterialXCore/Element.cpp b/source/MaterialXCore/Element.cpp
@@ -168,7 +168,7 @@ void Element::setChildIndex(const string& name, int index)
         return;
     }
 
-    if (index < 0 || index > (int) _childOrder.size())
+    if (index < 0 || index >= (int) _childOrder.size())
     {
         throw Exception("Invalid child index");
     }

diff --git a/source/MaterialXTest/MaterialXCore/Element.cpp b/source/MaterialXTest/MaterialXCore/Element.cpp
@@ -54,6 +54,9 @@ TEST_CASE("Element", "[element]")
     REQUIRE(*doc2 != *doc);
     doc2->setChildIndex("elem1", doc2->getChildIndex("elem2"));
     REQUIRE(*doc2 == *doc);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", -100), mx::Exception);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", -1), mx::Exception);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 2), mx::Exception);
     REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 100), mx::Exception);
     REQUIRE(*doc2 == *doc);
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,7 +168,7 @@ void Element::setChildIndex(const string& name, int index) @@
             return;
         }
-        if (index < 0 || index > (int) _childOrder.size())
+        if (index < 0 || index >= (int) _childOrder.size())
         {
             throw Exception("Invalid child index");
         }
@@ Expand Down @@