From: David Rheinsberg Date: Thu, 14 Mar 2019 12:26:50 +0000 (+0100) Subject: sd-bus: avoid magic number in SASL length calculation X-Git-Tag: v242-rc1~129^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cacdab925c40a5d9b7cf3f67719201bbaa17f67;p=thirdparty%2Fsystemd.git sd-bus: avoid magic number in SASL length calculation Lets avoid magic numbers and use a constant `strlen()` instead. Signed-off-by: David Rheinsberg --- diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 89ac503ab84..8ee92501423 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -386,7 +386,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) @@ -398,7 +400,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)