Attachment 78805 Details for Bug 62530 – McdSlacker: don't crash if SessionManager is absent or StatusChanged has no parameters

[patch] McdSlacker: don't crash if SessionManager is absent or StatusChanged has no parameters

0001-McdSlacker-don-t-crash-if-SessionManager-is-absent-o.patch (text/plain), 1.96 KB, created by Simon McVittie on 2013-05-03 12:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-05-03 12:05:19 UTC

Size: 1.96 KB

patch

obsolete

>From 15599f8d154e29ab93fa6a00198e814b85021e52 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 3 May 2013 13:01:44 +0100
>Subject: [PATCH] McdSlacker: don't crash if SessionManager is absent or
> StatusChanged has no parameters
>
>---
> src/mcd-slacker.c |   27 ++++++++++++++++++++++++---
> 1 file changed, 24 insertions(+), 3 deletions(-)
>
>diff --git a/src/mcd-slacker.c b/src/mcd-slacker.c
>index 5609ef4..ab3e57c 100644
>--- a/src/mcd-slacker.c
>+++ b/src/mcd-slacker.c
>@@ -83,7 +83,8 @@ status_changed (McdSlacker *self,
> 
>   if (g_variant_classify (prop) != G_VARIANT_CLASS_UINT32)
>     {
>-      WARNING ("Status property is of type %s and we expected an uint32",
>+      WARNING ("%s.%s property is of type %s and we expected u",
>+          SERVICE_INTERFACE, SERVICE_PROP_NAME,
>           g_variant_get_type_string (prop));
>       return;
>     }
>@@ -112,6 +113,14 @@ signal_cb (GDBusProxy *proxy,
>   if (tp_strdiff (signal_name, SERVICE_SIG_NAME))
>     return;
> 
>+  if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(u)")))
>+    {
>+      WARNING ("%s.%s arguments are of type %s and we expected (u)",
>+          SERVICE_INTERFACE, SERVICE_PROP_NAME,
>+          g_variant_get_type_string (parameters));
>+      return;
>+    }
>+
>   prop = g_variant_get_child_value (parameters, 0);
>   status_changed (self, prop);
>   g_variant_unref (prop);
>@@ -137,8 +146,20 @@ proxy_new_cb (GObject *source,
>       G_CALLBACK (signal_cb), self);
> 
>   prop = g_dbus_proxy_get_cached_property (self->priv->proxy, SERVICE_PROP_NAME);
>-  status_changed (self, prop);
>-  g_variant_unref (prop);
>+
>+  if (g_dbus_proxy_get_name_owner (self->priv->proxy) == NULL)
>+    {
>+      DEBUG ("%s service not found", SERVICE_NAME);
>+    }
>+  else if (prop == NULL)
>+    {
>+      DEBUG ("%s.%s property is missing", SERVICE_INTERFACE, SERVICE_PROP_NAME);
>+    }
>+  else
>+    {
>+      status_changed (self, prop);
>+      g_variant_unref (prop);
>+    }
> 
> out:
>   g_object_unref (self);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 62530: 78805 | 78806

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.