Address XMLDynamicParser regression (#5383)

* Refs #22054: Add Regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #22054: Add fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit fe29535)
eProsima · Nov 6, 2024 · bd08f14 · bd08f14
1 parent c230154
commit bd08f14
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/cpp/xmlparser/XMLDynamicParser.cpp b/src/cpp/xmlparser/XMLDynamicParser.cpp
@@ -577,9 +577,16 @@ XMLP_ret XMLParser::parseXMLBitsetDynamicType(
     const char* baseType = p_root->Attribute(BASE_TYPE);
     if (baseType != nullptr)
     {
-        DynamicTypeBuilder::_ref_type parent_type_builder;
+        DynamicTypeBuilder::_ref_type parent_type_builder = nullptr;
         XMLProfileManager::getDynamicTypeBuilderByName(parent_type_builder, baseType);
-        DynamicType::_ref_type parent_type = parent_type_builder->build();
+
+        DynamicType::_ref_type parent_type = nullptr;
+
+        if (nullptr != parent_type_builder)
+        {
+            parent_type = parent_type_builder->build();
+        }
+
         if (parent_type && (TK_BITSET == parent_type->get_kind() ||
                 TK_BITSET ==
                 traits<DynamicType>::narrow<DynamicTypeImpl>(parent_type)->resolve_alias_enclosed_type()->get_kind()))

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -84,6 +84,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21223_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21334_profile_bin.xml", root));
     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));
     Log::Flush();
 }
 

diff --git a/test/unittest/xmlparser/regressions/22054_profile_bin.xml b/test/unittest/xmlparser/regressions/22054_profile_bin.xml
@@ -0,0 +1 @@
+<types><type><bitset name="]" baseType="`/d" /></type></types>