Revert "userspace-probe: replace explicit null-termination check"
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 11 Sep 2020 15:10:44 +0000 (11:10 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 11 Sep 2020 15:19:20 +0000 (11:19 -0400)
This reverts commit b9e63e21bd01c0deeaec2195ba912e38460bc038.

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

src/common/userspace-probe.c

index 49cc835750366166070c72c3bac21ef8ca0c50cf..9e5429f7378503029db5ff4afbf97ebc6588dc11 100644 (file)
@@ -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;
 
        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;
        }
                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;
        }
                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;
 
        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;
        }
 
                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;
        }
 
                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;
        }
                ret = -LTTNG_ERR_INVALID;
                goto end;
        }
This page took 0.02676 seconds and 5 git commands to generate.