Attachment 121769 Details for Bug 94136 – [2/4] DBusMessage: assert the properties we need DBusMessageIter to have

[patch] [2/4] DBusMessage: assert the properties we need DBusMessageIter to have

0002-DBusMessage-assert-the-properties-we-need-DBusMessag.patch (text/plain), 1.52 KB, created by Simon McVittie on 2016-02-15 15:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-02-15 15:10:10 UTC

Size: 1.52 KB

patch

obsolete

>From e7ddb06b496412d7a015859f441d7bc5ec4124a1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 15 Feb 2016 14:58:59 +0000
>Subject: [PATCH 2/4] DBusMessage: assert the properties we need
> DBusMessageIter to have
>
>We already asserted that DBusMessageIter must be at least as large
>as DBusMessageRealIter (so that casting DBusMessageIter * to
>DBusMessageRealIter * does not result in overflowing the stack
>variable). Also assert that it must have alignment requirements at
>least as strict as those of DBusMessageRealIter * (so that casting
>does not increase the required alignment).
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=94136
>---
> dbus/dbus-message.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 699e022..50e87ca 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -2025,7 +2025,10 @@ _dbus_message_iter_init_common (DBusMessage         *message,
>                                 DBusMessageRealIter *real,
>                                 int                  iter_type)
> {
>+  /* If these static assertions fail on your platform, report it as a bug. */
>   _DBUS_STATIC_ASSERT (sizeof (DBusMessageRealIter) <= sizeof (DBusMessageIter));
>+  _DBUS_STATIC_ASSERT (_DBUS_ALIGNOF (DBusMessageRealIter) <=
>+      _DBUS_ALIGNOF (DBusMessageIter));
> 
>   /* Since the iterator will read or write who-knows-what from the
>    * message, we need to get in the right byte order
>-- 
>2.7.0
>

Actions: View | Splinter Review

Attachments on bug 94136: 121762 | 121768 | 121769 | 121770 | 121771

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.