brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[model] Do not attempt to free empty column names

Browse Source 
The column names are optional - ClutterModel will use the GType name
if there is no user-specified column name. Hence, the ::finalize vfunc
should not try to free an empty column names vector.

Fixes bug:

  http://bugzilla.openedhand.com/show_bug.cgi?id=1790
This commit is contained in:
Emmanuele Bassi 2009-09-02 15:26:33 +01:00
parent 3686107460
commit a5e081dc9c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clutter/clutter-model.c
View File

@ -222,13 +222,16 @@ clutter_model_finalize (GObject *object)
g_free (priv->column_types);
/* the column_names vector might have holes in it, so we need to
* use the columns number to clear up everything
*/
for (i = 0; i < priv->n_columns; i++)
g_free (priv->column_names[i]);
if (priv->column_names != NULL)
{
/* the column_names vector might have holes in it, so we need
* to use the columns number to clear up everything
*/
for (i = 0; i < priv->n_columns; i++)
g_free (priv->column_names[i]);
g_free (priv->column_names);
g_free (priv->column_names);
}
G_OBJECT_CLASS (clutter_model_parent_class)->finalize (object);
}