diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2008-05-26 14:28:45 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2008-05-26 14:28:45 +0000 |
| commit | c02440d5ba6a62cbddcf21602ebaa0f5a58ec8ad (patch) | |
| tree | 673c315ae95c464fe160e76dd1ba024a7d2c7c9b | |
| parent | 4fde37c81fce966c6eef285b7333e7ff91d34fe8 (diff) | |
| download | lasso-c02440d5ba6a62cbddcf21602ebaa0f5a58ec8ad.tar.gz lasso-c02440d5ba6a62cbddcf21602ebaa0f5a58ec8ad.tar.xz lasso-c02440d5ba6a62cbddcf21602ebaa0f5a58ec8ad.zip | |
don't test NULL value before calling gfree + proper list freeing
| -rw-r--r-- | lasso/id-wsf-2.0/data_service.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c index aa5e478a..966f7fca 100644 --- a/lasso/id-wsf-2.0/data_service.c +++ b/lasso/id-wsf-2.0/data_service.c @@ -893,23 +893,20 @@ dispose(GObject *object) return; service->private_data->dispose_has_run = TRUE; - if (service->type != NULL) { - g_free(service->type); - service->type = NULL; - } - if (service->redirect_url != NULL) { - g_free(service->redirect_url); - service->redirect_url = NULL; - } + g_free(service->type); + service->type = NULL; + + g_free(service->redirect_url); + service->redirect_url = NULL; + if (service->query_items != NULL) { + g_list_foreach(service->query_items, (GFunc)g_free, NULL); g_list_free(service->query_items); service->query_items = NULL; } - if (service->private_data->epr != NULL) { - lasso_node_destroy(LASSO_NODE(service->private_data->epr)); - service->private_data->epr = NULL; - } + lasso_node_destroy(LASSO_NODE(service->private_data->epr)); + service->private_data->epr = NULL; G_OBJECT_CLASS(parent_class)->dispose(object); } @@ -937,6 +934,7 @@ instance_init(LassoIdWsf2DataService *service) service->query_items = NULL; service->private_data = g_new0(LassoIdWsf2DataServicePrivate, 1); service->private_data->epr = NULL; + service->private_data->credentials = NULL; } static void |