Attachment 45287 Details for Bug 35766 – [PATCH 04/15] get_object_property: unwind on errors, and avoid returning NULL

[patch] [PATCH 04/15] get_object_property: unwind on errors, and avoid returning NULL

0004-get_object_property-unwind-on-errors-and-avoid-retur.patch (text/plain), 2.69 KB, created by Simon McVittie on 2011-04-05 10:05:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-05 10:05:15 UTC

Size: 2.69 KB

patch

obsolete

>From 29db4997448a895273248bb5f2a1cc9b731b9f65 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Apr 2011 15:25:55 +0100
>Subject: [PATCH 04/15] get_object_property: unwind on errors, and avoid returning NULL
>
>Also treat all errors here as programming errors (because this method
>should never fail), upgrading them from warning to critical; return a
>D-Bus error reply anyway, to be nicer to our callers.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
>---
> dbus/dbus-gobject.c |   33 +++++++++++++++++++++++----------
> 1 files changed, 23 insertions(+), 10 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 24600f3..ea214d9 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -1051,6 +1051,7 @@ get_object_property (DBusConnection *connection,
>   gchar *variant_sig;
>   DBusMessage *ret;
>   DBusMessageIter iter, subiter;
>+  gchar *error_message = NULL;
> 
>   ret = reply_or_die (message);
> 
>@@ -1061,9 +1062,10 @@ get_object_property (DBusConnection *connection,
>   if (variant_sig == NULL)
>     {
>       value_gtype = G_VALUE_TYPE (&value);
>-      g_warning ("Cannot marshal type \"%s\" in variant", g_type_name (value_gtype));
>-      g_value_unset (&value);
>-      return ret;
>+      error_message = g_strdup_printf (
>+          "Internal error: cannot marshal type \"%s\" in variant",
>+          g_type_name (value_gtype));
>+      goto out;
>     }
> 
>   dbus_message_iter_init_append (ret, &iter);
>@@ -1072,24 +1074,35 @@ get_object_property (DBusConnection *connection,
> 					 variant_sig,
> 					 &subiter))
>     {
>-      g_free (variant_sig);
>-      g_value_unset (&value);
>-      return ret;
>+      error_message = g_strdup_printf (
>+          "Internal error: cannot open variant container for signature %s",
>+          variant_sig);
>+      goto out;
>     }
> 
>   if (!_dbus_gvalue_marshal (&subiter, &value))
>     {
>-      dbus_message_unref (ret);
>-      ret = dbus_message_new_error (message,
>-                                    DBUS_ERROR_UNKNOWN_METHOD,
>-                                    "Can't convert GType of object property to a D-BUS type");
>+      dbus_message_iter_abandon_container (&iter, &subiter);
>+      error_message = g_strdup_printf (
>+          "Internal error: could not marshal type \"%s\" in variant",
>+          G_VALUE_TYPE_NAME (&value));
>+      goto out;
>     }
> 
>   dbus_message_iter_close_container (&iter, &subiter);
> 
>+out:
>   g_value_unset (&value);
>   g_free (variant_sig);
> 
>+  if (error_message != NULL)
>+    {
>+      dbus_message_unref (ret);
>+      ret = error_or_die (message, DBUS_ERROR_FAILED, error_message);
>+      g_critical ("%s", error_message);
>+      g_free (error_message);
>+    }
>+
>   return ret;
> }
> 
>-- 
>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.