Attachment 46536 Details for Bug 37062 – [PATCH 5/6] marshal_collection_array: statically assert that size conversion is not needed

[patch] [PATCH 5/6] marshal_collection_array: statically assert that size conversion is not needed

0005-marshal_collection_array-statically-assert-that-size.patch (text/plain), 1.38 KB, created by Simon McVittie on 2011-05-10 03:36:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-10 03:36:23 UTC

Size: 1.38 KB

patch

obsolete

>From 2a2c93e8fccb053a569c2d893bd5ad4fd97053cb Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 10 May 2011 11:16:45 +0100
>Subject: [PATCH 5/6] marshal_collection_array: statically assert that size
> conversion is not needed
>
>Previously, the function blindly assumed this without a check.
>---
> dbus/dbus-gvalue.c |   10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
>index 2c2b59a..e154da4 100644
>--- a/dbus/dbus-gvalue.c
>+++ b/dbus/dbus-gvalue.c
>@@ -1926,6 +1926,16 @@ marshal_collection_ptrarray (DBusMessageIter         *iter,
>   return dbus_message_iter_close_container (iter, &subiter);
> }
> 
>+/* If any of these assertions are violated, then marshal_collection_array
>+ * is buggy for that type. dbus_g_value_basic_array_parse_variant() has
>+ * general size-conversion code, if needed. */
>+G_STATIC_ASSERT (sizeof (dbus_bool_t) == sizeof (gboolean));
>+G_STATIC_ASSERT (sizeof (dbus_int32_t) == sizeof (gint));
>+G_STATIC_ASSERT (sizeof (dbus_uint32_t) == sizeof (guint));
>+/* These should be true regardless, but just for completeness... */
>+G_STATIC_ASSERT (sizeof (dbus_int64_t) == sizeof (gint64));
>+G_STATIC_ASSERT (sizeof (dbus_uint64_t) == sizeof (guint64));
>+G_STATIC_ASSERT (sizeof (double) == sizeof (gdouble));
> 
> static gboolean
> marshal_collection_array (DBusMessageIter   *iter,
>-- 
>1.7.5.1
>

Actions: View | Splinter Review

Attachments on bug 37062: 46532 | 46533 | 46534 | 46535 | 46536 | 46537

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.