Fix: event: unchecked return value for lttng_strncpy

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index c3a2c0eb7203566924b0240559f3fe4bbc46a272..8e1b99ff902fb5dd91989840ade2ffc483afc170 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -200,6 +200,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload(
        local_attr = NULL;
        ret = offset;
 end:
+       free(local_attr);
        return ret;
 }
 
@@ -261,6 +262,7 @@ static ssize_t lttng_event_function_attr_create_from_payload(
        local_attr = NULL;
        ret = offset;
 end:
+       free(local_attr);
        return ret;
 }
 
@@ -619,7 +621,7 @@ deserialize_event_type_payload:
                }
 
                if (ret != event_comm->userspace_probe_location_len) {
-                       WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 ", payload length = %lu", event_comm->userspace_probe_location_len, ret);
+                       WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 ", payload length = %zd", event_comm->userspace_probe_location_len, ret);
                        ret = -1;
                        goto end;
                }
@@ -995,7 +997,8 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload(
                const struct lttng_payload_view *view,
                struct lttng_event_context *event_ctx)
 {
-       ssize_t ret, offset = 0;
+       int ret;
+       ssize_t consumed, offset = 0;
        const struct lttng_event_context_perf_counter_comm *comm;
        size_t name_len;
        const struct lttng_buffer_view comm_view = lttng_buffer_view_from_view(
@@ -1007,7 +1010,7 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload(
                        event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER);
 
        if (!lttng_buffer_view_is_valid(&comm_view)) {
-               ret = -1;
+               consumed = -1;
                goto end;
        }
 
@@ -1024,7 +1027,7 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload(
                                                name_len);
 
                if (!lttng_buffer_view_is_valid(&provider_name_view)) {
-                       ret = -1;
+                       consumed = -1;
                        goto end;
                }
 
@@ -1032,21 +1035,25 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload(
 
                if (!lttng_buffer_view_contains_string(
                                    &provider_name_view, name, name_len)) {
-                       ret = -1;
+                       consumed = -1;
                        goto end;
                }
 
-               lttng_strncpy(event_ctx->u.perf_counter.name, name, name_len);
+               ret = lttng_strncpy(event_ctx->u.perf_counter.name, name, name_len);
+               if (ret) {
+                       consumed = -1;
+                       goto end;
+               }
                offset += name_len;
        }
 
        event_ctx->u.perf_counter.config = comm->config;
        event_ctx->u.perf_counter.type = comm->type;
 
-       ret = offset;
+       consumed = offset;
 
 end:
-       return ret;
+       return consumed;
 }
 
 ssize_t lttng_event_context_create_from_payload(
@@ -1145,7 +1152,8 @@ static int lttng_event_context_app_serialize(
        }
 
        /* Include the null terminator. */
-       comm.provider_name_len = provider_len + 1;
+       provider_len += 1;
+       comm.provider_name_len = provider_len;
 
        ctx_len = strlen(ctx_name);
        if (ctx_len == 0) {
@@ -1154,7 +1162,8 @@ static int lttng_event_context_app_serialize(
        }
 
        /* Include the null terminator. */
-       comm.ctx_name_len = ctx_len + 1;
+       ctx_len += 1;
+       comm.ctx_name_len = ctx_len;
 
        /* Header */
        ret = lttng_dynamic_buffer_append(&payload->buffer, &comm,