Fix parse XML member dynamic type fuzzer issue (#5007)

* Refs #21223: Add regression test Signed-off-by: elianalf <[email protected]> * Refs #21223: Add fix Signed-off-by: elianalf <[email protected]> * Refs #21223: Apply suggestion Signed-off-by: elianalf <[email protected]> --------- Signed-off-by: elianalf <[email protected]>
eProsima · Jul 2, 2024 · 379da7d · 379da7d
1 parent 00b127c
commit 379da7d
Show file tree

Hide file tree

Showing 3 changed files with 388 additions and 3 deletions.
diff --git a/src/cpp/xmlparser/XMLDynamicParser.cpp b/src/cpp/xmlparser/XMLDynamicParser.cpp
@@ -1635,9 +1635,15 @@ DynamicType::_ref_type XMLParser:: parseXMLMemberDynamicType(
         {
             std::vector<uint32_t> boundsArray;
             dimensionsToArrayBounds(memberArray, boundsArray);
-            member = factory->create_array_type(
-                string_builder->build(),
-                boundsArray)->build();
+            DynamicTypeBuilder::_ref_type builder_ = factory->create_array_type(string_builder->build(), boundsArray);
+            if (nullptr != builder_)
+            {
+                member = builder_->build();
+            }
+            else
+            {
+                member = nullptr;
+            }
         }
     }
     else if (strncmp(memberType, WSTRING, WSTRING_len) == 0)

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -81,6 +81,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21153_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21154_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21181_profile_bin.xml", root));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21223_profile_bin.xml", root));
     Log::Flush();
 }