X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent.c;h=850b97f14ec9738a86e5919cc22cc0cbc69c5b1d;hb=d133f6d7bba25fb5662108987a929abbfcaabc7f;hp=b90bc2a2f33cf6bc1610895c47ae1eb879ecd0cb;hpb=c2afda67713866265294d11c72deca6edba05969;p=lttng-tools.git

diff --git a/src/common/event.c b/src/common/event.c
index b90bc2a2f..850b97f14 100644
--- a/src/common/event.c
+++ b/src/common/event.c
@@ -194,6 +194,7 @@ static ssize_t lttng_event_probe_attr_create_from_buffer(
 	local_attr = NULL;
 	ret = offset;
 end:
+	free(local_attr);
 	return ret;
 }
 
@@ -252,6 +253,7 @@ static ssize_t lttng_event_function_attr_create_from_buffer(
 	local_attr = NULL;
 	ret = offset;
 end:
+	free(local_attr);
 	return ret;
 }
 
@@ -1197,7 +1199,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) {
@@ -1206,7 +1209,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(buffer, &comm, sizeof(comm));