Attachment 44953 Details for Bug 30171 – marshal_signature: check validity of the signature

[patch] marshal_signature: check validity of the signature

0010-marshal_signature-check-validity-of-the-signature.patch (text/plain), 1.07 KB, created by Simon McVittie on 2011-03-28 11:18:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-03-28 11:18:00 UTC

Size: 1.07 KB

patch

obsolete

>From 9f000c5d9f4f656d60a4b5f6d3089c182b02143a Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Mar 2011 17:21:18 +0100
>Subject: [PATCH 10/25] marshal_signature: check validity of the signature
>
>Also remove a spurious cast, and comment why we're *not* assuming that
>failure here is necessarily OOM.
>---
> dbus/dbus-gvalue.c |    5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
>index db84472..7293981 100644
>--- a/dbus/dbus-gvalue.c
>+++ b/dbus/dbus-gvalue.c
>@@ -1614,8 +1614,11 @@ marshal_signature (DBusMessageIter         *iter,
> 
>   g_assert (G_VALUE_TYPE (value) == DBUS_TYPE_G_SIGNATURE);
> 
>-  sig = (const char*) g_value_get_boxed (value);
>+  sig = g_value_get_boxed (value);
>+  g_return_val_if_fail (g_variant_is_signature (sig), FALSE);
> 
>+  /* failure here isn't strictly *guaranteed* to be OOM, since GDBus might
>+   * understand more type-codes than our libdbus */
>   if (!dbus_message_iter_append_basic (iter,
> 				       DBUS_TYPE_SIGNATURE,
> 				       &sig))
>-- 
>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.