From 2574e50bcf1c825a030a119ba39d45a55d568d30 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 18 Jan 2015 13:32:37 +0000 Subject: [PATCH] minor cleanup (coverity) --- clients/tools/ldapexop.c | 2 +- clients/tools/ldapurl.c | 1 + libraries/libldap_r/tpool.c | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c index f112a3ffbe..1d05f23141 100644 --- a/clients/tools/ldapexop.c +++ b/clients/tools/ldapexop.c @@ -130,7 +130,7 @@ main( int argc, char *argv[] ) } } else if ( strcasecmp( argv[ 0 ], "passwd" ) == 0 ) { - fprintf( stderr, "use ldappasswd(1) instead.\n\n", argv[ 0 ] ); + fprintf( stderr, "use ldappasswd(1) instead.\n\n" ); usage(); /* TODO? */ diff --git a/clients/tools/ldapurl.c b/clients/tools/ldapurl.c index a4f4a2b7c2..a600a25e18 100644 --- a/clients/tools/ldapurl.c +++ b/clients/tools/ldapurl.c @@ -159,6 +159,7 @@ do_uri_explode( const char *uri ) printf( "extension: %s\n", lud->lud_exts[i] ); } } + ldap_free_urldesc( lud ); return 0; } diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c index 12371db354..02a9980037 100644 --- a/libraries/libldap_r/tpool.c +++ b/libraries/libldap_r/tpool.c @@ -214,14 +214,22 @@ ldap_pvt_thread_pool_init ( if (pool == NULL) return(-1); rc = ldap_pvt_thread_mutex_init(&pool->ltp_mutex); - if (rc != 0) + if (rc != 0) { +fail1: + LDAP_FREE(pool); return(rc); + } rc = ldap_pvt_thread_cond_init(&pool->ltp_cond); - if (rc != 0) - return(rc); + if (rc != 0) { +fail2: + ldap_pvt_thread_mutex_destroy(&pool->ltp_mutex); + goto fail1; + } rc = ldap_pvt_thread_cond_init(&pool->ltp_pcond); - if (rc != 0) - return(rc); + if (rc != 0) { + ldap_pvt_thread_cond_destroy(&pool->ltp_cond); + goto fail2; + } ldap_int_has_thread_pool = 1; -- 2.39.5