X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fuserspace-probe.c;fp=src%2Fcommon%2Fuserspace-probe.c;h=49cc835750366166070c72c3bac21ef8ca0c50cf;hp=9e5429f7378503029db5ff4afbf97ebc6588dc11;hb=b9e63e21bd01c0deeaec2195ba912e38460bc038;hpb=f04a82006fc82e66b505b9428b0f54b533d6ddf0

diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c
index 9e5429f73..49cc83575 100644
--- a/src/common/userspace-probe.c
+++ b/src/common/userspace-probe.c
@@ -1212,11 +1212,14 @@ int lttng_userspace_probe_location_function_create_from_payload(
 	binary_path_src = function_name_src +
 			location_function_comm->function_name_len;
 
-	if (function_name_src[location_function_comm->function_name_len - 1] != '\0') {
+	if (lttng_buffer_view_contains_string(&view->buffer, function_name_src,
+			    location_function_comm->function_name_len)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
-	if (binary_path_src[location_function_comm->binary_path_len - 1] != '\0') {
+
+	if (lttng_buffer_view_contains_string(&view->buffer, binary_path_src,
+			    location_function_comm->binary_path_len)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
@@ -1300,17 +1303,20 @@ int lttng_userspace_probe_location_tracepoint_create_from_payload(
 	binary_path_src = provider_name_src +
 			location_tracepoint_comm->provider_name_len;
 
-	if (probe_name_src[location_tracepoint_comm->probe_name_len - 1] != '\0') {
+	if (lttng_buffer_view_contains_string(&view->buffer, probe_name_src,
+			    location_tracepoint_comm->probe_name_len)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	if (provider_name_src[location_tracepoint_comm->provider_name_len - 1] != '\0') {
+	if (lttng_buffer_view_contains_string(&view->buffer, provider_name_src,
+			    location_tracepoint_comm->provider_name_len)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}
 
-	if (binary_path_src[location_tracepoint_comm->binary_path_len - 1] != '\0') {
+	if (lttng_buffer_view_contains_string(&view->buffer, binary_path_src,
+			    location_tracepoint_comm->binary_path_len)) {
 		ret = -LTTNG_ERR_INVALID;
 		goto end;
 	}