]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
dbus-marshal-validate: Add an extra assertion
authorSimon McVittie <smcv@collabora.com>
Mon, 12 Sep 2022 12:07:15 +0000 (13:07 +0100)
committerSimon McVittie <smcv@collabora.com>
Fri, 7 Oct 2022 13:15:40 +0000 (14:15 +0100)
We already checked that claimed_len <= (end - p), therefore we can
assume that claimed_len + p <= end. Make this a bit more obvious.

Signed-off-by: Simon McVittie <smcv@collabora.com>
dbus/dbus-marshal-validate.c

index 7d0d6cf7270fb4d20838e68a4e0f8dd2f4fdf8ab..28e622f76e5969984006195aa93aea5dc0f34695 100644 (file)
@@ -495,6 +495,9 @@ validate_body_helper (DBusTypeReader       *reader,
                 _dbus_type_reader_recurse (reader, &sub);
 
                 array_end = p + claimed_len;
+                /* We effectively already checked this, by checking that
+                 * claimed_len <= (end - p) */
+                _dbus_assert (array_end <= end);
 
                 array_elem_type = _dbus_type_reader_get_element_type (reader);