Attachment 44957 Details for Bug 30171 – marshal_collection_ptrarray: assert that the signature is valid

[patch] marshal_collection_ptrarray: assert that the signature is valid

0014-marshal_collection_ptrarray-assert-that-the-signatur.patch (text/plain), 1022 bytes, created by Simon McVittie on 2011-03-28 11:19:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-03-28 11:19:22 UTC

Size: 1022 bytes

patch

obsolete

>From 8de6c965adcd3a992a93ea09951f09421cd0b5fc Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Mar 2011 17:24:18 +0100
>Subject: [PATCH 14/25] marshal_collection_ptrarray: assert that the signature is valid
>
>This means that dbus_message_iter_open_container can't fail except by OOM,
>so use the shared handler.
>---
> dbus/dbus-gvalue.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
>index 3203ed9..6493bc5 100644
>--- a/dbus/dbus-gvalue.c
>+++ b/dbus/dbus-gvalue.c
>@@ -1908,12 +1908,14 @@ marshal_collection_ptrarray (DBusMessageIter         *iter,
>       g_warning ("Cannot marshal type \"%s\" in collection\n", g_type_name (elt_gtype));
>       return FALSE;
>     }
>+  g_assert (g_variant_is_signature (elt_sig));
> 
>   if (!dbus_message_iter_open_container (iter,
> 					 DBUS_TYPE_ARRAY,
> 					 elt_sig,
> 					 &subiter))
>-    goto oom;
>+    oom ();
>+
>   g_free (elt_sig);
> 
>   data.iter = &subiter;
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 30171: 44943 | 44944 | 44945 | 44946 | 44947 | 44948 | 44949 | 44950 | 44951 | 44952 | 44953 | 44954 | 44955 | 44956 | 44957 | 44958 | 44959 | 44960 | 44961 | 44962 | 44963 | 44964 | 44965 | 44966 | 44967 | 44968

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.