Backport #5565 Fixed conflicts

Signed-off-by: Eugenio Collado <[email protected]>
eProsima · Feb 4, 2025 · 2ca1e80 · 2ca1e80
1 parent bc53ad5
commit 2ca1e80
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp b/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
@@ -1185,6 +1185,13 @@ p_dynamictypebuilder_t XMLParser::parseXMLMemberDynamicType(
             dimensionsToArrayBounds(memberArray, bounds);
             memberBuilder = factory->create_array_builder(innerBuilder, bounds);
             //factory->DeleteBuilder(innerBuilder);
+            if (nullptr == innerBuilder)
+            {
+                EPROSIMA_LOG_ERROR(XMLPARSER,
+                        "Error parsing map member type: `create_map_type` failed for key=`" << keyTypeBuilder <<
+                        "`, value=`" << valueTypeBuilder << "`, length=`" << length << "`.");
+                return nullptr;
+            }
         }
     }
     else if (strncmp(memberType, BOOLEAN, 8) == 0)

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -78,6 +78,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20608_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20610_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20732_profile_bin.xml", root));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/22535_profile_bin.xml", root));
 }
 
 TEST_F(XMLParserTests, NoFile)

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