Fix: lttng: uninitialized pointer free'd when no sessiond is present

[lttng-tools.git] / src / common / condition.c

diff --git a/src/common/condition.c b/src/common/condition.c
index 6cebeb03f7bb9d35e651a9a110bb36f087cfd1fe..076f0627cb48387abfe217bf6f5d77e200ad2074 100644 (file)
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -1,23 +1,14 @@
 /*
 /*

- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>

  *
  *

- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only

  *
  *

- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */
 
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
  */
 
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>

+#include <lttng/condition/session-rotation-internal.h>

 #include <common/macros.h>
 #include <common/error.h>
 #include <common/dynamic-buffer.h>
 #include <common/macros.h>
 #include <common/error.h>
 #include <common/dynamic-buffer.h>


@@ -142,6 +133,12 @@ ssize_t lttng_condition_create_from_buffer(
        case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
                create_from_buffer = lttng_condition_session_consumed_size_create_from_buffer;
                break;
        case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
                create_from_buffer = lttng_condition_session_consumed_size_create_from_buffer;
                break;

+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+               create_from_buffer = lttng_condition_session_rotation_ongoing_create_from_buffer;
+               break;
+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+               create_from_buffer = lttng_condition_session_rotation_completed_create_from_buffer;
+               break;

        default:
                ERR("Attempted to create condition of unknown type (%i)",
                                (int) condition_comm->condition_type);
        default:
                ERR("Attempted to create condition of unknown type (%i)",
                                (int) condition_comm->condition_type);