Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / src / common / actions / stop-session.cpp

diff --git a/src/common/actions/stop-session.cpp b/src/common/actions/stop-session.cpp
index 55f1a55ed239df31bcfa40771c6d0f48bb4fa6f6..d395c66d64e11eea2a3e85ad0f7b7e0901c95c10 100644 (file)
--- a/src/common/actions/stop-session.cpp
+++ b/src/common/actions/stop-session.cpp
@@ -5,18 +5,19 @@
  *
  */
 
-#include <common/error.h>
-#include <common/macros.h>
-#include <common/mi-lttng.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/rate-policy-internal.h>
+#include <common/error.hpp>
+#include <common/macros.hpp>
+#include <common/mi-lttng.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/rate-policy-internal.hpp>
 #include <lttng/action/rate-policy.h>
-#include <lttng/action/stop-session-internal.h>
+#include <lttng/action/stop-session-internal.hpp>
 #include <lttng/action/stop-session.h>
 
 #define IS_STOP_SESSION_ACTION(action) \
        (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_STOP_SESSION)
 
+namespace {
 struct lttng_action_stop_session {
        struct lttng_action parent;
 
@@ -37,6 +38,7 @@ struct lttng_action_stop_session_comm {
         */
        char data[];
 } LTTNG_PACKED;
+} /* namespace */
 
 static const struct lttng_rate_policy *
 lttng_action_stop_session_internal_get_rate_policy(
@@ -291,7 +293,7 @@ end:
 
 struct lttng_action *lttng_action_stop_session_create(void)
 {
-       struct lttng_action *action = NULL;
+       struct lttng_action_stop_session *action_stop = NULL;
        struct lttng_rate_policy *policy = NULL;
        enum lttng_action_status status;
 
@@ -301,12 +303,12 @@ struct lttng_action *lttng_action_stop_session_create(void)
                goto end;
        }
 
-       action = (lttng_action *) zmalloc(sizeof(struct lttng_action_stop_session));
-       if (!action) {
+       action_stop = zmalloc<lttng_action_stop_session>();
+       if (!action_stop) {
                goto end;
        }
 
-       lttng_action_init(action, LTTNG_ACTION_TYPE_STOP_SESSION,
+       lttng_action_init(&action_stop->parent, LTTNG_ACTION_TYPE_STOP_SESSION,
                        lttng_action_stop_session_validate,
                        lttng_action_stop_session_serialize,
                        lttng_action_stop_session_is_equal,
@@ -315,16 +317,17 @@ struct lttng_action *lttng_action_stop_session_create(void)
                        lttng_action_generic_add_error_query_results,
                        lttng_action_stop_session_mi_serialize);
 
-       status = lttng_action_stop_session_set_rate_policy(action, policy);
+       status = lttng_action_stop_session_set_rate_policy(
+                       &action_stop->parent, policy);
        if (status != LTTNG_ACTION_STATUS_OK) {
-               free(action);
-               action = NULL;
+               lttng_action_destroy(&action_stop->parent);
+               action_stop = NULL;
                goto end;
        }
 
 end:
        lttng_rate_policy_destroy(policy);
-       return action;
+       return &action_stop->parent;
 }
 
 enum lttng_action_status lttng_action_stop_session_set_session_name(