From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 11 Sep 2020 15:10:44 +0000 (-0400)
Subject: Revert "userspace-probe: replace explicit null-termination check"
X-Git-Tag: v2.13.0-rc1~478
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2f8d430ce8e8429d5278d77ce4627a49c82403bf;p=lttng-tools.git

Revert "userspace-probe: replace explicit null-termination check"

This reverts commit b9e63e21bd01c0deeaec2195ba912e38460bc038.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I909339dbdcf4a7931ad95c5b4b6af152aa52487c
---

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