From df5797843625da2b5ca495a9df1a8f2d041da61f Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Wed, 13 Sep 2000 21:48:29 +0000 Subject: [PATCH] specifically check for NULL return from ldap_int_thread_delist(). Also, fixup comment to get rid of compiler warning. --- libraries/libldap_r/tpool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c index c99450c320..224cf695aa 100644 --- a/libraries/libldap_r/tpool.c +++ b/libraries/libldap_r/tpool.c @@ -120,7 +120,7 @@ ldap_pvt_thread_pool_init ( * but ltp_open_count == 1, so two things happen: * 1) the first client connection fails, and 2) when * slapd is kill'ed, it never terminates since it waits - * for all worker threads to exit. + * for all worker threads to exit. */ /* start up one thread, just so there is one. no need to * lock the mutex right now, since no threads are running. @@ -315,8 +315,8 @@ ldap_pvt_thread_pool_destroy ( ldap_pvt_thread_pool_t *tpool, int run_pending ) ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex); } while (waiting > 0); - while (ctx = (ldap_int_thread_ctx_t *)ldap_int_thread_delist( - &pool->ltp_pending_list, NULL)) + while ((ctx = (ldap_int_thread_ctx_t *)ldap_int_thread_delist( + &pool->ltp_pending_list, NULL)) != NULL) { free(ctx); } -- 2.39.5