Fix: NULL pointer dereference in lttng_condition_serialize

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

diff --git a/src/common/condition.c b/src/common/condition.c
index 0b184422a69bf0b3f3b36f877d0522b1ce8d8ee7..98c97a595016c772c54aead040809005f6838be2 100644 (file)
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -66,14 +66,16 @@ ssize_t lttng_condition_serialize(const struct lttng_condition *condition,
                char *buf)
 {
        ssize_t ret, condition_size;
-       struct lttng_condition_comm condition_comm;
+       struct lttng_condition_comm condition_comm = {
+               .condition_type = (int8_t) (condition ?
+                               condition->type : LTTNG_CONDITION_TYPE_UNKNOWN)
+       };
 
        if (!condition) {
                ret = -1;
                goto end;
        }
 
-       condition_comm.condition_type = (int8_t) condition->type;
        ret = sizeof(struct lttng_condition_comm);
        if (buf) {
                memcpy(buf, &condition_comm, ret);