gcr: Fix null pointer dereference when finalizing GcrCollectionModel
authorStef Walter <stefw@collabora.co.uk>
Wed, 7 Sep 2011 14:14:08 +0000 (16:14 +0200)
committerStef Walter <stefw@collabora.co.uk>
Wed, 7 Sep 2011 14:14:08 +0000 (16:14 +0200)
gcr/gcr-collection-model.c

index 78b2221..e46bf51 100644 (file)
@@ -1200,10 +1200,11 @@ gcr_collection_model_finalize (GObject *object)
        g_assert (g_hash_table_size (self->pv->object_to_seq) == 0);
        g_hash_table_destroy (self->pv->object_to_seq);
 
-       g_assert (g_hash_table_size (self->pv->selected) == 0);
-       if (self->pv->selected)
+       if (self->pv->selected) {
+               g_assert (g_hash_table_size (self->pv->selected) == 0);
                g_hash_table_destroy (self->pv->selected);
-       self->pv->selected = NULL;
+               self->pv->selected = NULL;
+       }
 
        self->pv->columns = NULL;
        for (i = 0; i < self->pv->n_columns; i++)