From d524f9f9089b71d83e991ed42d25a4616ec575a2 Mon Sep 17 00:00:00 2001 From: David Rheinsberg Date: Thu, 14 Mar 2019 13:26:50 +0100 Subject: [PATCH] sd-bus: avoid magic number in SASL length calculation Lets avoid magic numbers and use a constant `strlen()` instead. Signed-off-by: David Rheinsberg (cherry picked from commit 3cacdab925c40a5d9b7cf3f67719201bbaa17f67) Related: #1838081 --- src/libsystemd/sd-bus/bus-socket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 4a72795d2b..1c8b331b48 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -390,7 +390,9 @@ static int bus_socket_auth_verify_server(sd_bus *b) { if (line_begins(line, l, "AUTH ANONYMOUS")) { - r = verify_anonymous_token(b, line + 14, l - 14); + r = verify_anonymous_token(b, + line + strlen("AUTH ANONYMOUS"), + l - strlen("AUTH ANONYMOUS")); if (r < 0) return r; if (r == 0) @@ -402,7 +404,9 @@ static int bus_socket_auth_verify_server(sd_bus *b) { } else if (line_begins(line, l, "AUTH EXTERNAL")) { - r = verify_external_token(b, line + 13, l - 13); + r = verify_external_token(b, + line + strlen("AUTH EXTERNAL"), + l - strlen("AUTH EXTERNAL")); if (r < 0) return r; if (r == 0)