Fix oss-fuzz 42193 (#2397)

MiguelCompany · web-flow · commit 4874d11575f3 · 2022-01-11T08:03:26.000+01:00
* Refs 13418. Regression test.

Signed-off-by: Miguel Company &lt;MiguelCompany@eprosima.com&gt;

* Refs 13418. Fix issue.

Signed-off-by: Miguel Company &lt;MiguelCompany@eprosima.com&gt;
diff --git a/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp b/src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
@@ -1336,12 +1336,13 @@ p_dynamictypebuilder_t XMLParser::parseXMLMemberDynamicType(
     {
         if (!isArray)
         {
-            logError(XMLPARSER, "Failed creating " << memberType << ": " << memberName);
+            logError(XMLPARSER, "Failed creating " << memberType << ": " << (memberName ? memberName : ""));
         }
         else
         {
-            logError(XMLPARSER, "Failed creating " << memberType << " array: " << memberName);
+            logError(XMLPARSER, "Failed creating " << memberType << " array: " << (memberName ? memberName : ""));
         }
+        return nullptr;
     }
 
     const char* memberTopicKey = p_root->Attribute(KEY);
diff --git a/test/unittest/xmlparser/CMakeLists.txt b/test/unittest/xmlparser/CMakeLists.txt
@@ -64,6 +64,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/UDP_transport_descriptors_config.xml
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SHM_transport_descriptors_config.xml
     ${CMAKE_CURRENT_BINARY_DIR}/SHM_transport_descriptors_config.xml
     COPYONLY)
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/regressions" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 
 ###################################  XMLProfileParserTests  ####################################################
 set(XMLPROFILEPARSER_SOURCE
diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -55,6 +55,7 @@ TEST_F(XMLParserTests, regressions)
     std::unique_ptr<BaseNode> root;
 
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/12736.xml", root));
+    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/13418.xml", root));
 }
 
 TEST_F(XMLParserTests, NoFile)
diff --git a/test/unittest/xmlparser/regressions/13418.xml b/test/unittest/xmlparser/regressions/13418.xml
@@ -0,0 +1 @@
+<types><type><typedef type=""arrayDimensions=""/></type></types>

Original file line number	Diff line number	Diff line change
`@@ -1336,12 +1336,13 @@ p_dynamictypebuilder_t XMLParser::parseXMLMemberDynamicType(`
`1336`	`1336`	`{`
`1337`	`1337`	`if (!isArray)`
`1338`	`1338`	`{`
`1339`		`- logError(XMLPARSER, "Failed creating " << memberType << ": " << memberName);`
	`1339`	`+ logError(XMLPARSER, "Failed creating " << memberType << ": " << (memberName ? memberName : ""));`
`1340`	`1340`	`}`
`1341`	`1341`	`else`
`1342`	`1342`	`{`
`1343`		`- logError(XMLPARSER, "Failed creating " << memberType << " array: " << memberName);`
	`1343`	`+ logError(XMLPARSER, "Failed creating " << memberType << " array: " << (memberName ? memberName : ""));`
`1344`	`1344`	`}`
	`1345`	`+ return nullptr;`
`1345`	`1346`	`}`
`1346`	`1347`
`1347`	`1348`	`const char* memberTopicKey = p_root->Attribute(KEY);`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ TEST_F(XMLParserTests, regressions)`
`55`	`55`	`std::unique_ptr<BaseNode> root;`
`56`	`56`
`57`	`57`	`EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/12736.xml", root));`
	`58`	`+ EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/13418.xml", root));`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`TEST_F(XMLParserTests, NoFile)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<types><type><typedef type=""arrayDimensions=""/></type></types>`