summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2023-01-19 16:17:43 +0100
committerSimon McVittie <smcv@collabora.com>2023-02-08 12:03:30 +0000
commit8d54aa2ffd74c0ced1b180d162abd749458ace32 (patch)
tree4db2b7785a8e48bdda9c3701dcb3b4952b44ff66
parent8189a74c6cc40c0ce10b91eb999ab26f7ceef82b (diff)
downloaddbus-8d54aa2ffd74c0ced1b180d162abd749458ace32.tar.gz
_dbus_string_skip_blank(): Let the final assert follow the previous search
This appears to have been a copy/paste mistake. If only blanks (defined as spaces or tabs) were removed, then it cannot be right to check for white space (defined as spaces, tabs, carriage return or linefeed) afterwards. If libdbus was compiled with assertions enabled, then this is a denial-of-service issue for dbus-daemon or other users of DBusServer: an unauthenticated user with access to the server's socket can send whitespace that triggers this assertion failure. We recommend that production versions of dbus, for example in OS distributions, should be compiled with checks but without assertions. [smcv: expanded commit message] Thanks: Evgeny Vereshchagin Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/421
-rw-r--r--dbus/dbus-string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index b3826fe1..29210de7 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -1880,7 +1880,7 @@ _dbus_string_skip_blank (const DBusString *str,
++i;
}
- _dbus_assert (i == real->len || !DBUS_IS_ASCII_WHITE (real->str[i]));
+ _dbus_assert (i == real->len || !DBUS_IS_ASCII_BLANK (real->str[i]));
if (end)
*end = i;