Fix oss-fuzz 43650 (#2655)

* Refs #13513. Regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #13513. Fixed issue. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit 6e6908a) Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Apr 29, 2022 · 290bfd5 · 290bfd5
1 parent 6d70a27
commit 290bfd5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp b/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
@@ -341,9 +341,17 @@ XMLP_ret XMLParser::parseXMLAliasDynamicType(
         if (valueBuilder != nullptr)
         {
             const char* name = p_root->Attribute(NAME);
-            p_dynamictypebuilder_t typeBuilder =
-                    types::DynamicTypeBuilderFactory::get_instance()->create_alias_builder(valueBuilder, name);
-            XMLProfileManager::insertDynamicTypeByName(name, typeBuilder);
+            if (name != nullptr)
+            {
+                p_dynamictypebuilder_t typeBuilder =
+                        types::DynamicTypeBuilderFactory::get_instance()->create_alias_builder(valueBuilder, name);
+                XMLProfileManager::insertDynamicTypeByName(name, typeBuilder);
+            }
+            else
+            {
+                logError(XMLPARSER, "Error parsing alias type: No name attribute given.");
+                ret = XMLP_ret::XML_ERROR;
+            }
         }
         else
         {

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -57,6 +57,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/12736.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/13418.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/13454.xml", root));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/13513.xml", root));
 }
 
 TEST_F(XMLParserTests, NoFile)

diff --git a/test/unittest/xmlparser/regressions/13513.xml b/test/unittest/xmlparser/regressions/13513.xml
@@ -0,0 +1 @@
+<types><type><typedef type="int8"/></type></types>