From 0666a152c28cd1ddf09a9c3d53fba345039c31bb Mon Sep 17 00:00:00 2001 From: Jan Hutter Date: Mon, 21 Nov 2005 17:53:42 +0000 Subject: [PATCH] - still one memory leak and segmentation fault --- Source/charon/ike_sa.c | 1 - Source/charon/utils/logger_manager.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c index ab4d3e5..3d0b942 100644 --- a/Source/charon/ike_sa.c +++ b/Source/charon/ike_sa.c @@ -303,7 +303,6 @@ static status_t destroy (protected_ike_sa_t *this) this->logger->log(this->logger, CONTROL | MOST, "Destroy logger of IKE_SA"); - global_logger_manager->destroy_logger(global_logger_manager, this->logger); allocator_free(this); diff --git a/Source/charon/utils/logger_manager.c b/Source/charon/utils/logger_manager.c index 2d1587c..0470e7a 100644 --- a/Source/charon/utils/logger_manager.c +++ b/Source/charon/utils/logger_manager.c @@ -234,7 +234,7 @@ static status_t destroy_logger (private_logger_manager_t *this,logger_t *logger) { linked_list_iterator_t *iterator; - status_t status; + status_t status = NOT_FOUND; pthread_mutex_lock(&(this->mutex)); if (this->loggers->create_iterator(this->loggers,&iterator,TRUE) != SUCCESS) @@ -263,7 +263,6 @@ static status_t destroy_logger (private_logger_manager_t *this,logger_t *logger) } } iterator->destroy(iterator); - pthread_mutex_unlock(&(this->mutex)); return status; } -- 2.7.4