Handle nullptr in parseXMLStructDynamicType (#5080)

* Refs #21334: Handle nullptr in parseXMLStructDynamicType Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #21334: uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Jul 18, 2024 · de9136d · de9136d
1 parent b0eb813
commit de9136d
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
@@ -982,9 +982,16 @@ XMLP_ret XMLParser::parseXMLStructDynamicType(
     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_STRUCTURE == parent_type->get_kind() ||
                 TK_STRUCTURE ==
                 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
@@ -82,6 +82,7 @@ TEST_F(XMLParserTests, regressions)
     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));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/21334_profile_bin.xml", root));
     Log::Flush();
 }