Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / src / common / uri.cpp

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 98ff2b471b0d87b3c9f3ae4dea8c449e83ae291e..3b74928b401cc469a9b2dca2f8f205b3746a1d71 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -7,16 +7,16 @@
 
 #define _LGPL_SOURCE
 #include <arpa/inet.h>
-#include <common/compat/netdb.h>
+#include <common/compat/netdb.hpp>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/utils.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/utils.hpp>
 
-#include "uri.h"
+#include "uri.hpp"
 
 #define LOOPBACK_ADDR_IPV4 "127.0.0.1"
 #define LOOPBACK_ADDR_IPV6 "::1"
@@ -25,6 +25,7 @@ enum uri_proto_code {
        P_NET, P_NET6, P_FILE, P_TCP, P_TCP6,
 };
 
+namespace {
 struct uri_proto {
        const char *name;
        const char *leading_string;
@@ -34,7 +35,7 @@ struct uri_proto {
 };
 
 /* Supported protocols */
-static const struct uri_proto proto_uri[] = {
+const struct uri_proto proto_uri[] = {
        { .name = "file", .leading_string = "file://", .code = P_FILE, .type = LTTNG_PROTO_TYPE_NONE, .dtype = LTTNG_DST_PATH },
        { .name = "net", .leading_string = "net://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 },
        { .name = "net4", .leading_string = "net4://", .code = P_NET, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 },
@@ -43,8 +44,9 @@ static const struct uri_proto proto_uri[] = {
        { .name = "tcp4", .leading_string = "tcp4://", .code = P_TCP, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV4 },
        { .name = "tcp6", .leading_string = "tcp6://", .code = P_TCP6, .type = LTTNG_TCP, .dtype = LTTNG_DST_IPV6 },
        /* Invalid proto marking the end of the array. */
-       { 0 }
+       {}
 };
+} /* namespace */
 
 /*
  * Return pointer to the character in s matching one of the characters in
@@ -306,7 +308,7 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
        }
 
        /* Allocate URI array */
-       tmp_uris = (lttng_uri *) zmalloc(sizeof(struct lttng_uri) * size);
+       tmp_uris = calloc<lttng_uri>(size);
        if (tmp_uris == NULL) {
                PERROR("zmalloc uri");
                goto error;
@@ -634,7 +636,7 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
                goto error;
        }
 
-       tmp_uris = (lttng_uri *) zmalloc(sizeof(struct lttng_uri) * uri_count);
+       tmp_uris = calloc<lttng_uri>(uri_count);
        if (tmp_uris == NULL) {
                PERROR("zmalloc uris");
                goto error;