Attachment 45296 Details for Bug 35766 – [PATCH 13/15] get_all_object_properties: note which operations can only fail via OOM

[patch] [PATCH 13/15] get_all_object_properties: note which operations can only fail via OOM

0013-get_all_object_properties-note-which-operations-can-.patch (text/plain), 2.45 KB, created by Simon McVittie on 2011-04-05 10:08:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-05 10:08:07 UTC

Size: 2.45 KB

patch

obsolete

>From f1c8bf3c51ba18074d7f1eba8b38b224a1dd92fa Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Apr 2011 18:02:47 +0100
>Subject: [PATCH 13/15] get_all_object_properties: note which operations can only fail via OOM
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
>---
> dbus/dbus-gobject.c |   12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 5516b60..61aed9a 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -1243,6 +1243,7 @@ get_all_object_properties (DBusConnection        *connection,
> 
>   dbus_message_iter_init_append (ret, &iter_ret);
> 
>+  /* the types are all hard-coded, so this can only fail via OOM */
>   if (!dbus_message_iter_open_container (&iter_ret,
>                                          DBUS_TYPE_ARRAY,
>                                          DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
>@@ -1299,14 +1300,24 @@ get_all_object_properties (DBusConnection        *connection,
>           continue;
>         }
> 
>+      /* a signature returned by _dbus_gvalue_to_signature had better be
>+       * valid */
>+      g_assert (g_variant_is_signature (variant_sig));
>+
>+      /* type is hard-coded, so this can't fail except by OOM */
>       if (!dbus_message_iter_open_container (&iter_dict,
>                                              DBUS_TYPE_DICT_ENTRY,
>                                              NULL,
>                                              &iter_dict_entry))
>         goto oom;
>+
>+      /* prop_name is valid UTF-8, so this can't fail except by OOM; no point
>+       * in abandoning @iter_dict_entry since we're about to crash out */
>       if (!dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop_name))
>         goto oom;
> 
>+      /* variant_sig has been asserted to be valid, so this can't fail
>+       * except by OOM */
>       if (!dbus_message_iter_open_container (&iter_dict_entry,
>                                              DBUS_TYPE_VARIANT,
>                                              variant_sig,
>@@ -1316,6 +1327,7 @@ get_all_object_properties (DBusConnection        *connection,
>       if (!_dbus_gvalue_marshal (&iter_dict_value, &value))
>         goto oom;
> 
>+      /* these shouldn't fail except by OOM now that we were successful */
>       if (!dbus_message_iter_close_container (&iter_dict_entry,
>                                               &iter_dict_value))
>         goto oom;
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35766: 45284 | 45285 | 45286 | 45287 | 45288 | 45289 | 45290 | 45291 | 45292 | 45293 | 45294 | 45295 | 45296 | 45297 | 45298

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.