Fix: sessiond: NULL pointer dereference after NULL check

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

diff --git a/src/common/tracker.c b/src/common/tracker.c
index c27d9765562e590241e2ae9ba5ece15e8bbdc1a0..e4aae431d19a4896c818267c4ab781c0b85bac08 100644 (file)
--- a/src/common/tracker.c
+++ b/src/common/tracker.c
@@ -85,6 +85,7 @@ enum lttng_error_code process_attr_value_from_comm(
                name = strdup(value_view->data);
                if (!name) {
                        ret = LTTNG_ERR_NOMEM;
                name = strdup(value_view->data);
                if (!name) {
                        ret = LTTNG_ERR_NOMEM;

+                       goto error;

                }
        }
 
                }
        }
 


@@ -105,7 +106,8 @@ enum lttng_error_code process_attr_value_from_comm(
        if (is_value_type_name(value_type) && value_view->size == 0) {
                ret = LTTNG_ERR_INVALID_PROTOCOL;
                goto error;
        if (is_value_type_name(value_type) && value_view->size == 0) {
                ret = LTTNG_ERR_INVALID_PROTOCOL;
                goto error;

-       } else if (!is_value_type_name(value_type) && value_view->size != 0) {
+       } else if (!is_value_type_name(value_type) && value_view &&
+                       value_view->size != 0) {

                ret = LTTNG_ERR_INVALID_PROTOCOL;
                goto error;
        }
                ret = LTTNG_ERR_INVALID_PROTOCOL;
                goto error;
        }