minor cleanup (coverity)

diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c
index f112a3ffbee0abeace9e31f27c4689a46c96776e..1d05f231411a3e59660e0fe6d529cd05d3de6c02 100644 (file)
--- 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 a4f4a2b7c2c7ce7bb317994c16f9132ba4557c66..a600a25e188b141810e4bedd063de816430fd458 100644 (file)
--- 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 12371db354531e82eaaaef419d91427ddf621e98..02a9980037ece0d550e0a573e329d7d3e759da4e 100644 (file)
--- 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;