From a5e081dc9c8f39ce66270b77f5beaa6ac53e7a91 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 2 Sep 2009 15:26:33 +0100 Subject: [PATCH] [model] Do not attempt to free empty column names 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 --- clutter/clutter-model.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/clutter/clutter-model.c b/clutter/clutter-model.c index 3fb9d952a..ab0467389 100644 --- a/clutter/clutter-model.c +++ b/clutter/clutter-model.c @@ -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); }