Use an array to hold the strings in a vector

Instead of building a GString by concatenating every string inside
an array to deserialize the array into a string vector property,
use a GPtrArray. This is far more efficient (no reallocations are
necessary, as we know the size of the array) and safe (the separator
used to build the string buffer and then split it might exist in
one of the original strings).

1 files changed, 5 insertions, 10 deletions

diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c
index b0a0e13..15e9ed5 100644
--- a/json-glib/json-gobject.c
+++ b/json-glib/json-gobject.c
@@ -189,8 +189,7 @@ json_deserialize_pspec (GValue     *value,
         {
           JsonArray *array = json_node_get_array (node);
           guint i, array_len = json_array_get_length (array);
-          GString *buffer = g_string_new (NULL);
-          gchar **strv = NULL;
+          GPtrArray *str_array = g_ptr_array_sized_new (array_len);
 
           for (i = 0; i < array_len; i++)
             {
@@ -200,17 +199,13 @@ json_deserialize_pspec (GValue     *value,
                 continue;
 
               if (json_node_get_string (val) != NULL);
-                {
-                  g_string_append (buffer, json_node_get_string (val));
-                  g_string_append_c (buffer, '\v');
-                }
+                g_ptr_array_add (str_array, (gpointer) json_node_get_string (val));
             }
 
-          strv = g_strsplit (buffer->str, "\v", -1);
-          g_value_set_boxed (value, strv);
+          g_value_set_boxed (value, str_array->pdata);
+
+          g_ptr_array_free (str_array, TRUE);
 
-          g_strfreev (strv);
-          g_string_free (buffer, TRUE);
           retval = TRUE;
         }
       break;