Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / src / bin / lttng / uprobe.cpp

diff --git a/src/bin/lttng/uprobe.cpp b/src/bin/lttng/uprobe.cpp
index 7a119ae61dea32fc4999f45cdba159cfa134c1fe..c6a2d9429090f3ce2141f0fbdd66ecc51272ff75 100644 (file)
--- a/src/bin/lttng/uprobe.cpp
+++ b/src/bin/lttng/uprobe.cpp
@@ -5,18 +5,19 @@
  *
  */
 
-#include "uprobe.h"
+#include "uprobe.hpp"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "common/compat/getenv.h"
-#include "common/string-utils/string-utils.h"
-#include "common/utils.h"
+#include "common/compat/getenv.hpp"
+#include "common/string-utils/string-utils.hpp"
+#include "common/utils.hpp"
+#include "common/path.hpp"
 #include "lttng/constant.h"
 
-#include "command.h"
+#include "command.hpp"
 
 /*
  * Walk the directories in the PATH environment variable to find the target
@@ -57,7 +58,7 @@ int walk_command_search_path(const char *binary, char *binary_full_path)
         * This char array is used to concatenate path to binary to look for
         * the binary.
         */
-       tentative_binary_path = (char *) zmalloc(LTTNG_PATH_MAX * sizeof(char));
+       tentative_binary_path = calloc<char>(LTTNG_PATH_MAX);
        if (!tentative_binary_path) {
                ret = -1;
                goto alloc_error;
@@ -291,7 +292,7 @@ int parse_userspace_probe_opts(const char *opt,
         */
        if (strchr(unescaped_target_path, '/') == NULL) {
                /* Walk the $PATH variable to find the targeted binary. */
-               real_target_path = (char *) zmalloc(LTTNG_PATH_MAX * sizeof(char));
+               real_target_path = calloc<char>(LTTNG_PATH_MAX);
                if (!real_target_path) {
                        PERROR("Error allocating path buffer");
                        ret = CMD_ERROR;