Fix null-dereference in parseXMLMemberDynamicType (#5565) (#5579)

* Refs #22535. Add regression test. Signed-off-by: Miguel Company <[email protected]> * Refs #22535. Fix issue. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit c0e7929) Co-authored-by: Miguel Company <[email protected]>
eProsima · Jan 31, 2025 · 00586a2 · 00586a2
1 parent 984d114
commit 00586a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/cpp/xmlparser/XMLDynamicParser.cpp b/src/cpp/xmlparser/XMLDynamicParser.cpp
@@ -1428,6 +1428,13 @@ DynamicType::_ref_type XMLParser:: parseXMLMemberDynamicType(
         {
             DynamicTypeBuilder::_ref_type inner_builder {factory->create_map_type(key_type, value_type,
                                                                  length)};
+            if (!inner_builder)
+            {
+                EPROSIMA_LOG_ERROR(XMLPARSER,
+                        "Error parsing map member type: `create_map_type` failed for key=`" << key_type <<
+                        "`, value=`" << value_type << "`, length=`" << length << "`.");
+                return {};
+            }
             std::vector<uint32_t> bounds;
             dimensionsToArrayBounds(memberArray, bounds);
             DynamicTypeBuilder::_ref_type builder = factory->create_array_type(

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -86,6 +86,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21856_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/22054_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/22101_profile_bin.xml", root));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/22535_profile_bin.xml", root));
     Log::Flush();
 }
 

diff --git a/test/unittest/xmlparser/regressions/22535_profile_bin.xml b/test/unittest/xmlparser/regressions/22535_profile_bin.xml