Merge lp:~unity-team/unity/unity.fix-752293 into lp:unity

[Mirco Müller]

potential fix for LP: #752293

[Didier Roche-Tolomelli (didrocks)]

Looks good! approved :)

review: Approve

=== modified file 'src/IndicatorObjectEntryProxyRemote.cpp'
--- src/IndicatorObjectEntryProxyRemote.cpp	2011-03-17 09:41:28 +0000
+++ src/IndicatorObjectEntryProxyRemote.cpp	2011-04-08 07:55:41 +0000
@@ -126,6 +126,10 @@
                                           bool        __image_sensitive,
                                           bool        __image_visible)
 {
+  // sanity check
+  if (!__id || !__label || !__image_data)
+    return;
+
   g_free (_id);
   g_free (_label);
   g_free (_image_data);
 
=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-04-06 12:34:53 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-04-08 07:55:41 +0000
@@ -329,21 +329,24 @@
 
 void
 IndicatorObjectFactoryRemote::Sync (GVariant *args)
-{
-  GVariantIter *iter;
-  gchar        *indicator_id;
-  gchar        *entry_id;
-  gchar        *label;
-  gboolean      label_sensitive;
-  gboolean      label_visible;
-  guint32       image_type;
-  gchar        *image_data;
-  gboolean      image_sensitive;
-  gboolean      image_visible;
-
+{    
+  GVariantIter *iter            = NULL;
+  gchar        *indicator_id    = NULL;
+  gchar        *entry_id        = NULL;
+  gchar        *label           = NULL;
+  gboolean      label_sensitive = false;
+  gboolean      label_visible   = false;
+  guint32       image_type      = 0;
+  gchar        *image_data      = NULL;
+  gboolean      image_sensitive = false;
+  gboolean      image_visible   = false;
   IndicatorObjectProxyRemote *current_proxy = NULL;
   gchar                      *current_proxy_id = NULL;
 
+  // sanity check
+  if (!args)
+    return;
+
   g_variant_get (args, "(a(sssbbusbb))", &iter);
   while (g_variant_iter_loop (iter, "(sssbbusbb)",
                               &indicator_id,
 
=== modified file 'src/IndicatorObjectProxyRemote.cpp'
--- src/IndicatorObjectProxyRemote.cpp	2011-03-17 09:41:28 +0000
+++ src/IndicatorObjectProxyRemote.cpp	2011-04-08 07:55:41 +0000
@@ -74,6 +74,10 @@
                                       bool         image_sensitive,
                                       bool         image_visible)
 {
+  // sanity check
+  if (!entry_id || !label || !image_data)
+    return;
+
   IndicatorObjectEntryProxyRemote *remote = NULL;
   std::vector<IndicatorObjectEntryProxy*>::iterator it;