Improve xml loading method in fuzz_XMLProfiles (#4685)

* Refs #20732: Change xml loading method to avoid copy to a file in fuzz_XMLProfiles Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20732: Remove methods no longer used Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20732: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Apr 16, 2024 · f1373f9 · f1373f9
1 parent 45a88ba
commit f1373f9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 94 deletions.
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx b/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx
@@ -1,5 +1,4 @@
-#include <fastrtps/Domain.h>
-#include <fastrtps/xmlparser/XMLProfileManager.h>
+#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 
 #include "fuzz_utils.h"
 
@@ -23,21 +22,7 @@ extern "C" int LLVMFuzzerTestOneInput(
         return EXIT_FAILURE;
     }
 
-    const char* filename = buf_to_file(data, size);
-
-    if (filename == NULL)
-    {
-        return EXIT_FAILURE;
-    }
-
-    // TODO change this to a func. taking buf + len (or C string)
-    // to avoid using `buf_to_file`
-    xmlparser::XMLProfileManager::loadXMLFile(filename);
-
-    if (delete_file(filename) != 0)
-    {
-        return EXIT_FAILURE;
-    }
+    fastdds::dds::DomainParticipantFactory::get_instance()->load_XML_profiles_string(reinterpret_cast<const char*>(data), size);
 
     return 0;
 }
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx
@@ -32,64 +32,3 @@ extern "C" int ignore_stdout(
 
     return ret;
 }
-
-extern "C" int delete_file(
-        const char* pathname)
-{
-    int ret = unlink(pathname);
-    if (ret == -1)
-    {
-        warn("failed to delete \"%s\"", pathname);
-    }
-
-    free((void*)pathname);
-
-    return ret;
-}
-
-extern "C" char* buf_to_file(
-        const uint8_t* buf,
-        size_t size)
-{
-    char* pathname = strdup("/dev/shm/fuzz-XXXXXX");
-    if (pathname == NULL)
-    {
-        return NULL;
-    }
-
-    int fd = mkstemp(pathname);
-    if (fd == -1)
-    {
-        warn("mkstemp(\"%s\")", pathname);
-        free(pathname);
-        return NULL;
-    }
-
-    size_t pos = 0;
-    while (pos < size)
-    {
-        int nbytes = write(fd, &buf[pos], size - pos);
-        if (nbytes <= 0)
-        {
-            if (nbytes == -1 && errno == EINTR)
-            {
-                continue;
-            }
-            warn("write");
-            goto err;
-        }
-        pos += nbytes;
-    }
-
-    if (close(fd) == -1)
-    {
-        warn("close");
-        goto err;
-    }
-
-    return pathname;
-
-err:
-    delete_file(pathname);
-    return NULL;
-}
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h
@@ -13,21 +13,5 @@
 extern "C" int ignore_stdout(
         void);
 
-// Delete the file passed as argument and free the associated buffer. This
-// function is meant to be called on buf_to_file return value.
-//
-// Return 0 on success, -1 otherwise.
-extern "C" int delete_file(
-        const char* pathname);
-
-// Write the data provided in buf to a new temporary file. This function is
-// meant to be called by LLVMFuzzerTestOneInput() for fuzz targets that only
-// take file names (and not data) as input.
-//
-// Return the path of the newly created file or NULL on error. The caller should
-// eventually free the returned buffer (see delete_file).
-extern "C" char* buf_to_file(
-        const uint8_t* buf,
-        size_t size);
 
 #endif  // FUZZ_UTILS_H_