From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 31 Jul 2009 00:05:32 +0000 (+0000)
Subject: Might help ITS#6145: change while to do-while, to make visible that the
X-Git-Tag: ACLCHECK_0~377
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=02e165258cf1f2d2b32c202cb8a4e85a9d2d4a99;p=openldap

Might help ITS#6145: change while to do-while, to make visible that the
loop saving malloced data is run at least once.
---

diff --git a/libraries/libldap_r/thr_debug.c b/libraries/libldap_r/thr_debug.c
index f0fd0f7786..5374f7c685 100644
--- a/libraries/libldap_r/thr_debug.c
+++ b/libraries/libldap_r/thr_debug.c
@@ -555,18 +555,21 @@ add_thread_info(
 	int detached )
 {
 	ldap_debug_thread_t *t;
+
 	if( thread_info_used >= thread_info_size ) {
 		unsigned int more = thread_info_size + 8;
 		unsigned int new_size = thread_info_size + more;
+
 		t = calloc( more, sizeof(ldap_debug_thread_t) );
 		assert( t != NULL );
 		thread_info = realloc( thread_info, new_size * sizeof(*thread_info) );
 		assert( thread_info != NULL );
-		while( thread_info_size < new_size ) {
+		do {
 			t->idx = thread_info_size;
 			thread_info[thread_info_size++] = t++;
-		}
+		} while( thread_info_size < new_size );
 	}
+
 	t = thread_info[thread_info_used];
 	init_usage( &t->usage, msg );
 	t->wrapped = *thread;
@@ -779,6 +782,7 @@ ldap_pvt_thread_create(
 	if( !options_done )
 		get_options();
 	ERROR_IF( !threading_enabled, "ldap_pvt_thread_create" );
+
 	if( wrap_threads ) {
 		ldap_debug_thread_call_t *call = malloc(
 			sizeof( ldap_debug_thread_call_t ) );
@@ -843,6 +847,7 @@ ldap_pvt_thread_join( ldap_pvt_thread_t thread, void **thread_return )
 				remove_thread_info( t, "ldap_pvt_thread_join" ) );
 		adjust_count( Idx_unjoined_thread, -1 );
 	}
+
 	return rc;
 }