Fix string leaks in deserialize vfuncs

When an object contains char * properties, its deserialize function will
overwrite these string values without freeing them first. They are not
necessarily NULL as they can have (default) values set upon construction,
so they need to be g_free'd before being overwritten.
This commit introduces a ibus_g_variant_get_child_string() to do this
and set the string value.

6 files changed, 41 insertions, 25 deletions

diff --git a/src/ibuscomponent.c b/src/ibuscomponent.c
index 67b9818a..c03c9e03 100644
--- a/src/ibuscomponent.c
+++ b/src/ibuscomponent.c
@@ -21,6 +21,7 @@
  */
 #include <glib/gstdio.h>
 #include "ibuscomponent.h"
+#include "ibusinternal.h"
 
 enum {
     LAST_SIGNAL,
@@ -384,14 +385,14 @@ ibus_component_deserialize (IBusComponent   *component,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_component_parent_class)->deserialize ((IBusSerializable *)component, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &component->priv->name);
-    g_variant_get_child (variant, retval++, "s", &component->priv->description);
-    g_variant_get_child (variant, retval++, "s", &component->priv->version);
-    g_variant_get_child (variant, retval++, "s", &component->priv->license);
-    g_variant_get_child (variant, retval++, "s", &component->priv->author);
-    g_variant_get_child (variant, retval++, "s", &component->priv->homepage);
-    g_variant_get_child (variant, retval++, "s", &component->priv->exec);
-    g_variant_get_child (variant, retval++, "s", &component->priv->textdomain);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->name);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->description);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->version);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->license);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->author);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->homepage);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->exec);
+    ibus_g_variant_get_child_string (variant, retval++, &component->priv->textdomain);
 
     GVariant *var;
     GVariantIter *iter = NULL;
diff --git a/src/ibusenginedesc.c b/src/ibusenginedesc.c
index ca488552..86bbccb5 100644
--- a/src/ibusenginedesc.c
+++ b/src/ibusenginedesc.c
@@ -21,6 +21,7 @@
  */
 #include <stdlib.h>
 #include "ibusenginedesc.h"
+#include "ibusinternal.h"
 #include "ibusxml.h"
 
 enum {
@@ -554,29 +555,29 @@ ibus_engine_desc_deserialize (IBusEngineDesc *desc,
      * you should not change the serialized order of name, longname,
      * description, ... because the order is also used in other applications
      * likes ibus-qt. */
-    g_variant_get_child (variant, retval++, "s", &desc->priv->name);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->longname);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->description);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->language);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->license);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->author);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->icon);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->name);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->longname);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->description);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->language);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->license);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->author);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->icon);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->layout);
     g_variant_get_child (variant, retval++, "u", &desc->priv->rank);
     /* The serialized order should be kept. */
-    g_variant_get_child (variant, retval++, "s", &desc->priv->hotkeys);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->symbol);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->setup);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->hotkeys);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->symbol);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->setup);
     if (g_variant_n_children (variant) < retval + 2)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_variant);
-    g_variant_get_child (variant, retval++, "s", &desc->priv->layout_option);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->layout_variant);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->layout_option);
     if (g_variant_n_children (variant) < retval + 1)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->version);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->version);
     if (g_variant_n_children (variant) < retval + 1)
         return retval;
-    g_variant_get_child (variant, retval++, "s", &desc->priv->textdomain);
+    ibus_g_variant_get_child_string (variant, retval++, &desc->priv->textdomain);
 
     return retval;
 }
diff --git a/src/ibusinternal.h b/src/ibusinternal.h
index 1135d8f8..49dc5646 100644
--- a/src/ibusinternal.h
+++ b/src/ibusinternal.h
@@ -68,5 +68,8 @@
  */
 #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
 
+G_GNUC_INTERNAL void
+ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str);
+
 #endif
 
diff --git a/src/ibusobservedpath.c b/src/ibusobservedpath.c
index dcbfa864..684cd77c 100644
--- a/src/ibusobservedpath.c
+++ b/src/ibusobservedpath.c
@@ -21,6 +21,7 @@
  */
 #include <glib/gstdio.h>
 #include <stdlib.h>
+#include "ibusinternal.h"
 #include "ibusobservedpath.h"
 
 
@@ -105,7 +106,7 @@ ibus_observed_path_deserialize (IBusObservedPath *path,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_observed_path_parent_class)->deserialize ((IBusSerializable *)path, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &path->path);
+    ibus_g_variant_get_child_string (variant, retval++, &path->path);
     g_variant_get_child (variant, retval++, "x", &path->mtime);
 
     return retval;
diff --git a/src/ibusproperty.c b/src/ibusproperty.c
index 3abd5e7a..5a3eee03 100644
--- a/src/ibusproperty.c
+++ b/src/ibusproperty.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  * USA
  */
+#include "ibusinternal.h"
 #include "ibusproperty.h"
 #include "ibusproplist.h"
 #include "ibusenumtypes.h"
@@ -398,7 +399,7 @@ ibus_property_deserialize (IBusProperty *prop,
     retval = IBUS_SERIALIZABLE_CLASS (ibus_property_parent_class)->deserialize ((IBusSerializable *) prop, variant);
     g_return_val_if_fail (retval, 0);
 
-    g_variant_get_child (variant, retval++, "s", &prop->priv->key);
+    ibus_g_variant_get_child_string (variant, retval++, &prop->priv->key);
     g_variant_get_child (variant, retval++, "u", &prop->priv->type);
 
     GVariant *subvar = g_variant_get_child_value (variant, retval++);
diff --git a/src/ibusutil.c b/src/ibusutil.c
index 215cb3f2..3eddc99c 100644
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -153,3 +153,12 @@ ibus_get_language_name(const gchar *_locale) {
 #endif
     }
 }
+
+void
+ibus_g_variant_get_child_string (GVariant *variant, gsize index, char **str)
+{
+    g_return_if_fail (str != NULL);
+
+    g_free (*str);
+    g_variant_get_child (variant, index, "s", str);
+}