Fix oss-fuzz 40243 (#2339)

* Refs 12736. Added regression test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12736. Fixed issue. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13161. Apply suggestion. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> (cherry picked from commit fc4fade)
eProsima · Dec 4, 2021 · 8ae251f · 8ae251f
1 parent 1f4a4b9
commit 8ae251f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp b/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
@@ -606,6 +606,10 @@ XMLP_ret XMLParser::parseXMLBitmaskDynamicType(
     }
 
     const char* name = p_root->Attribute(NAME);
+    if (nullptr == name)
+    {
+        return XMLP_ret::XML_ERROR;
+    }
     p_dynamictypebuilder_t typeBuilder =
             types::DynamicTypeBuilderFactory::get_instance()->create_bitmask_builder(bit_bound);
     typeBuilder->set_name(name);

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -50,6 +50,13 @@ using eprosima::fastrtps::xmlparser::XMLParser;
 using eprosima::fastdds::dds::Log;
 using eprosima::fastdds::dds::LogConsumer;
 
+TEST_F(XMLParserTests, regressions)
+{
+    std::unique_ptr<BaseNode> root;
+
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/12736.xml", root));
+}
+
 TEST_F(XMLParserTests, NoFile)
 {
     std::unique_ptr<BaseNode> root;

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