summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-04-05 15:43:30 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-08-17 19:18:55 +0100
commitd09dfcb130be0a17f337bd198a9fb43aab7dfa28 (patch)
treeb7dc834d34574487925d6e0b11315e305860c78d
parent7b92ac1bfd1e50e842549dbb14b845478d114652 (diff)
object_registration_message: check for OOM when a property is absent
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
-rw-r--r--dbus/dbus-gobject.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index 410cda5..92aae58 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -2190,9 +2190,11 @@ object_registration_message (DBusConnection *connection,
}
else
{
- ret = dbus_message_new_error_printf (message,
- DBUS_ERROR_INVALID_ARGS,
- "No such property %s", requested_propname);
+ gchar *error_message = g_strdup_printf ("No such property %s",
+ requested_propname);
+
+ ret = error_or_die (message, DBUS_ERROR_INVALID_ARGS, error_message);
+ g_free (error_message);
}
}