From e5d1a517274f6b523c8ed60abe23f899b1967c07 Mon Sep 17 00:00:00 2001

From: Noriko Hosoi <nhosoi@redhat.com>

Date: Thu, 15 May 2014 16:17:00 -0700

Subject: [PATCH 212/225] Ticket #47780 - Some VLV search request causes memory

 leaks

Fix description:

. Modified idl_free interface as follows so that passed idl is cleared

  with NULL once the IDList is successfully freed.

     -idl_free(IDList *idl)

     +idl_free(IDList **idl)

  This change is used to clean up search candidates when ldbm_back_

  search_cleanup (ldbm_search.c) is called as an error return.  The

  cleanup function frees the search candidates when it's not NULL and

  it's not assigned to sr_candidates field in the search result. This

  fixes a memory leak when VLV/Sort op fails.

. ldbm_back_search_cleanup (ldbm_search.c) calls slapi_send_ldap_result

  if an ldap error is passed to the function.  The logic used to be

  "if (ldap_result>=LDAP_SUCCESS)", which is based upon that mozldap

  return codes are all positive.  Supporting openldap library, there

  is a chance to get a negative return code (e.g. LDAP_PARAM_ERROR ==

  -9).  This patch supports the negative return codes, as well.

. In ldbm_back_search (ldbm_search.c) vlv_filter_candidates could

  ruturn errors such as and LDAP_TIMELIMIT_EXCEEDED, LDAP_ADMINLIMIT_

  EXCEEDED.  The search results are supposed to be returned to the

  client with the error code if the control is not critical.  The code

  is added.

. The VLV operation stores the result in vlv_response_control.result

  in ldbm_back_search (ldbm_search.c), which occurs at 3 places, vlv_

  filter_candidates, sort_candidates and vlv_trim_candidates_txn.

  The return code from the latter calls used to override the former

  return code.  This patch fixes it to respect the former return code.

https://fedorahosted.org/389/ticket/47780

Reviewed by rmeggins@redhat.com (Thank you, Rich!!)

(cherry picked from commit 1118cc9b61a60c704250080d6af8785e4f8d28af)

(cherry picked from commit e9f86dab95fd600b414cf1c4cf6f7c733348b758)

(cherry picked from commit ff4c7a7b3f65589f93d88aadfcbe95976a9b31a9)

(cherry picked from commit bd0fe25aaeea3edda7f4bd0d02d5617791aa058f)

---

 ldap/servers/slapd/back-ldbm/ancestorid.c      |  28 +--

 ldap/servers/slapd/back-ldbm/filterindex.c     |  50 ++---

 ldap/servers/slapd/back-ldbm/idl.c             |  92 ++++-----

 ldap/servers/slapd/back-ldbm/idl_common.c      |  12 +-

 ldap/servers/slapd/back-ldbm/idl_new.c         |   8 +-

 ldap/servers/slapd/back-ldbm/import-merge.c    |   6 +-

 ldap/servers/slapd/back-ldbm/import-threads.c  |   4 +-

 ldap/servers/slapd/back-ldbm/index.c           |  22 +--

 ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c   |   2 +-

 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c     |   4 +-

 ldap/servers/slapd/back-ldbm/ldbm_search.c     | 257 ++++++++++++++++---------

 ldap/servers/slapd/back-ldbm/ldif2ldbm.c       |  23 +--

 ldap/servers/slapd/back-ldbm/proto-back-ldbm.h |   2 +-

 ldap/servers/slapd/back-ldbm/seq.c             |   3 +-

 ldap/servers/slapd/back-ldbm/vlv.c             |   2 +-

 15 files changed, 289 insertions(+), 226 deletions(-)

diff --git a/ldap/servers/slapd/back-ldbm/ancestorid.c b/ldap/servers/slapd/back-ldbm/ancestorid.c

index 8722b68..54b08ad 100644

--- a/ldap/servers/slapd/back-ldbm/ancestorid.c

+++ b/ldap/servers/slapd/back-ldbm/ancestorid.c

@@ -136,7 +136,7 @@ static int ldbm_get_nonleaf_ids(backend *be, DB_TXN *txn, IDList **idl)

         LDAPDebug(LDAP_DEBUG_TRACE, "found %lu nodes for ancestorid\n", 

                   (u_long)IDL_NIDS(nodes), 0, 0);

     } else {

-        idl_free(nodes);

+        idl_free(&nodes);

         *idl = NULL;

     }

@@ -264,7 +264,7 @@ static int ldbm_ancestorid_default_create_index(backend *be)

         /* Insert into ancestorid for this node */

         if (id2idl_hash_lookup(ht, &id, &ididl)) {

             descendants = idl_union_allids(be, ai_aid, ididl->idl, children);

-            idl_free(children);

+            idl_free(&children);

             if (id2idl_hash_remove(ht, &id) == 0) {

                 LDAPDebug(LDAP_DEBUG_ANY, "ancestorid hash_remove failed\n", 0,0,0);

             } else {

@@ -279,21 +279,21 @@ static int ldbm_ancestorid_default_create_index(backend *be)

         /* Get parentid for this entry */

         ret = ldbm_parentid(be, txn, id, &parentid);

         if (ret != 0) {

-            idl_free(descendants);

+            idl_free(&descendants);

             break;

         }

         /* A suffix entry does not have a parent */

         if (parentid == NOID) {

-            idl_free(descendants);

+            idl_free(&descendants);

             continue;

         }

         /* Insert into ancestorid for this node's parent */

         if (id2idl_hash_lookup(ht, &parentid, &ididl)) {

             IDList *idl = idl_union_allids(be, ai_aid, ididl->idl, descendants);

-            idl_free(descendants);

-            idl_free(ididl->idl);

+            idl_free(&descendants);

+            idl_free(&(ididl->idl));

             ididl->idl = idl;

         } else {

             ididl = (id2idl*)slapi_ch_calloc(1,sizeof(id2idl));

@@ -324,7 +324,7 @@ static int ldbm_ancestorid_default_create_index(backend *be)

     id2idl_hash_destroy(ht);

     /* Free any leftover idlists */

-    idl_free(nodes);

+    idl_free(&nodes);

     /* Release the parentid file */

     if (db_pid != NULL) {

@@ -456,7 +456,7 @@ static int ldbm_ancestorid_new_idl_create_index(backend *be)

         /* Insert into ancestorid for this node */

         ret = idl_store_block(be, db_aid, &key, children, txn, ai_aid);

         if (ret != 0) {

-            idl_free(children);

+            idl_free(&children);

             break;

         }

@@ -467,13 +467,13 @@ static int ldbm_ancestorid_new_idl_create_index(backend *be)

                 slapi_log_error(SLAPI_LOG_FATAL, sourcefile,

                                 "Error: ldbm_parentid on node index [" ID_FMT "] of [" ID_FMT "]\n",

                                 nids, nodes->b_nids);

-                idl_free(children);

+                idl_free(&children);

                 goto out;

             }

             /* A suffix entry does not have a parent */

             if (parentid == NOID) {

-                idl_free(children);

+                idl_free(&children);

                 break;

             }

@@ -485,7 +485,7 @@ static int ldbm_ancestorid_new_idl_create_index(backend *be)

             /* Insert into ancestorid for this node's parent */

             ret = idl_store_block(be, db_aid, &key, children, txn, ai_aid);

             if (ret != 0) {

-                idl_free(children);

+                idl_free(&children);

                 goto out;

             }

             id = parentid;

@@ -504,7 +504,7 @@ static int ldbm_ancestorid_new_idl_create_index(backend *be)

     }

     /* Free any leftover idlists */

-    idl_free(nodes);

+    idl_free(&nodes);

     /* Release the parentid file */

     if (db_pid != NULL) {

@@ -583,7 +583,7 @@ static int ldbm_parentid(backend *be, DB_TXN *txn, ID id, ID *ppid)

 static void id2idl_free(id2idl **ididl)

 {

-    idl_free((*ididl)->idl);

+    idl_free(&((*ididl)->idl));

     slapi_ch_free((void**)ididl);

 }

@@ -785,7 +785,7 @@ static int ldbm_ancestorid_index_update(

                 break;

             }

             node_id = idl_firstid(idl);

-            idl_free(idl);

+            idl_free(&idl);

         }

         /* Update ancestorid for the base entry */

diff --git a/ldap/servers/slapd/back-ldbm/filterindex.c b/ldap/servers/slapd/back-ldbm/filterindex.c

index a213815..0998920 100644

--- a/ldap/servers/slapd/back-ldbm/filterindex.c

+++ b/ldap/servers/slapd/back-ldbm/filterindex.c

@@ -399,7 +399,7 @@ presence_candidates(

         LDAPDebug(LDAP_DEBUG_TRACE, 

                       "fallback to eq index as pres index gave allids\n", 

                       0, 0, 0);

-        idl_free(idl);

+        idl_free(&idl);

         idl = index_range_read_ext(pb, be, type, indextype_EQUALITY,

                                    SLAPI_OP_GREATER_OR_EQUAL,

                                    NULL, NULL, 0, &txn, err, allidslimit);

@@ -481,7 +481,7 @@ extensible_candidates(

                     else if (keys == NULL || keys[0] == NULL)

                     {

                         /* no keys */

-                        idl_free (idl);

+                        idl_free (&idl);

                         idl = idl_allids (be);

                     }

                     else

@@ -516,8 +516,8 @@ extensible_candidates(

                             else

                             {

                                 IDList* tmp = idl_intersection (be, idl2, idl3);

-                                idl_free (idl2);

-                                idl_free (idl3);

+                                idl_free (&idl2);

+                                idl_free (&idl3);

                                 idl2 = tmp;

                             }

                             if (idl2 == NULL) break; /* look no further */

@@ -529,8 +529,8 @@ extensible_candidates(

                         else if (idl2 != NULL)

                         {

                             IDList* tmp = idl_union (be, idl, idl2);

-                            idl_free (idl);

-                            idl_free (idl2);

+                            idl_free (&idl);

+                            idl_free (&idl2);

                             idl = tmp;

                         }

                     }

@@ -797,7 +797,7 @@ list_candidates(

                 {

                     LDAPDebug( LDAP_DEBUG_TRACE,

                         "<= list_candidates NULL\n", 0, 0, 0 );

-                    idl_free( idl );

+                    idl_free( &idl );

                     idl = NULL;

                     goto out;

                 }

@@ -807,7 +807,7 @@ list_candidates(

                 == NULL && ftype == LDAP_FILTER_AND ) {

                     LDAPDebug( LDAP_DEBUG_TRACE,

                         "<= list_candidates NULL\n", 0, 0, 0 );

-                    idl_free( idl );

+                    idl_free( &idl );

                     idl = NULL;

                     goto out;

             }

@@ -822,18 +822,24 @@ list_candidates(

             }

         } else if ( ftype == LDAP_FILTER_AND ) {

             if (isnot) {

-                IDList *new_idl = NULL;

-                int notin_result = 0;

-                notin_result = idl_notin( be, idl, tmp, &new_idl );

-                if (notin_result) {

-                    idl_free(idl);

-                    idl = new_idl;

+                /*

+                 * If tmp is NULL or ALLID, idl_notin just duplicates idl.

+                 * We don't have to do it.

+                 */

+                if (!tmp && !idl_is_allids(tmp)) {

+                    IDList *new_idl = NULL;

+                    int notin_result = 0;

+                    notin_result = idl_notin( be, idl, tmp, &new_idl );

+                    if (notin_result) {

+                        idl_free(&idl);

+                        idl = new_idl;

+                    }

                 }

             } else {

                 idl = idl_intersection(be, idl, tmp);

-                idl_free( tmp2 );

+                idl_free( &tmp2 );

             }

-            idl_free( tmp );

+            idl_free( &tmp );

             /* stop if the list has gotten too small */

             if ((idl == NULL) ||

                 (idl_length(idl) <= FILTER_TEST_THRESHOLD))

@@ -843,8 +849,8 @@ list_candidates(

             slapi_pblock_get( pb, SLAPI_OPERATION, &operation );

             idl = idl_union( be, idl, tmp );

-            idl_free( tmp );

-            idl_free( tmp2 );

+            idl_free( &tmp );

+            idl_free( &tmp2 );

             /* stop if we're already committed to an exhaustive

              * search. :(

              */

@@ -853,7 +859,7 @@ list_candidates(

             if (op_is_pagedresults(operation)) {

                 int nids = IDL_NIDS(idl);

                 if ( allidslimit > 0 && nids > allidslimit ) {

-                    idl_free( idl );

+                    idl_free( &idl );

                     idl = idl_allids( be );

                 }

             }

@@ -976,7 +982,7 @@ keys2idl(

         }

 #endif

         if ( idl2 == NULL ) {

-            idl_free( idl );

+            idl_free( &idl );

             idl = NULL;

             break;

         }

@@ -988,8 +994,8 @@ keys2idl(

             tmp = idl;

             idl = idl_intersection(be, idl, idl2);

-            idl_free( idl2 );

-            idl_free( tmp );

+            idl_free( &idl2 );

+            idl_free( &tmp );

             if ( idl == NULL ) {

                 break;

             }

diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c

index 76ee252..67fa711 100644

--- a/ldap/servers/slapd/back-ldbm/idl.c

+++ b/ldap/servers/slapd/back-ldbm/idl.c

@@ -280,12 +280,12 @@ idl_old_fetch(

 	if ( ! INDIRECT_BLOCK( idl ) ) {

 		/* make sure we have the current value of highest id */

 		if ( ALLIDS(idl) ) {

-			idl_free( idl );

+			idl_free( &idl );

 			idl = idl_allids( be );

 		}	

 		return( idl );

 	}

-       	idl_free( idl );

+       	idl_free( &idl );

 	/* Taking a transaction is expensive; so we try and optimize for the common case by not

 	   taking one above. If we have a indirect block; we need to take a transaction and re-read

@@ -307,7 +307,7 @@ idl_old_fetch(

 		dblayer_read_txn_commit(li,&s_txn);

 		/* make sure we have the current value of highest id */

 		if ( ALLIDS(idl) ) {

-			idl_free( idl );

+			idl_free( &idl );

 			idl = idl_allids( be );

 		}	

 		return( idl );

@@ -367,7 +367,7 @@ idl_old_fetch(

 	dblayer_read_txn_commit(li,&s_txn);	

 	tmp[i] = NULL;

 	slapi_ch_free((void**)&kstr );

-	idl_free( idl );

+	idl_free( &idl );

 	/* allocate space for the big block */

 	idl = idl_alloc( nids );

@@ -384,7 +384,7 @@ idl_old_fetch(

 		    tmp[i]->b_nids * sizeof(ID) );

 		nids += tmp[i]->b_nids;

-		idl_free( tmp[i] );

+		idl_free( &tmp[i] );

 	}

 	slapi_ch_free((void**)&tmp );

@@ -629,7 +629,7 @@ idl_old_insert_key(

 				   rc, (msg = dblayer_strerror( rc )) ? msg : "", 0 );

 		}

-		idl_free( idl );

+		idl_free( &idl );

 		idl_unlock_list(a->ai_idl,key);

 		return( rc );

 	}

@@ -655,10 +655,10 @@ idl_old_insert_key(

 		case 3:		/* id not inserted - block must be split */

 			/* check threshold for marking this an all-id block */

 			if ( a->ai_idl->idl_maxindirect < 2 ) {

-				idl_free( idl );

+				idl_free( &idl );

 				idl = idl_allids( be );

 				rc = idl_store( be, db, key, idl, txn );

-				idl_free( idl );

+				idl_free( &idl );

 				idl_unlock_list(a->ai_idl,key);

 				if ( rc != 0 && rc != DB_LOCK_DEADLOCK)

@@ -673,7 +673,7 @@ idl_old_insert_key(

 			}

 			idl_split_block( idl, id, &tmp, &tmp2 );

-			idl_free( idl );

+			idl_free( &idl );

 			/* create the header indirect block */

 			idl = idl_alloc( 3 );

@@ -686,9 +686,9 @@ idl_old_insert_key(

 			/* store it */

 			rc = idl_store( be, db, key, idl, txn );

 			if ( rc != 0 ) {

-				idl_free( idl );

-				idl_free( tmp );

-				idl_free( tmp2 );

+				idl_free( &idl );

+				idl_free( &tmp );

+				idl_free( &tmp2 );

 				if ( rc != DB_LOCK_DEADLOCK )

 				{

 					LDAPDebug( LDAP_DEBUG_ANY, "idl_insert_key 3 BAD %d %s\n",

@@ -712,9 +712,9 @@ idl_old_insert_key(

 			k2.dsize = strlen( kstr ) + 1;

 			rc = idl_store( be, db, &k2, tmp2, txn );

 			if ( rc != 0 ) {

-				idl_free( idl );

-				idl_free( tmp );

-				idl_free( tmp2 );

+				idl_free( &idl );

+				idl_free( &tmp );

+				idl_free( &tmp2 );

 				if ( rc != DB_LOCK_DEADLOCK )

 				{

 					LDAPDebug( LDAP_DEBUG_ANY, "idl_insert_key 4 BAD %d %s\n",

@@ -726,12 +726,12 @@ idl_old_insert_key(

 					    "idl_insert_key", "split", key, id);

 			slapi_ch_free((void**)&kstr );

-			idl_free( tmp );

-			idl_free( tmp2 );

+			idl_free( &tmp );

+			idl_free( &tmp2 );

 			break;

 		}

-		idl_free( idl );

+		idl_free( &idl );

 		idl_unlock_list(a->ai_idl,key);

 		if ( rc != 0 && rc != DB_LOCK_DEADLOCK )

 		{

@@ -759,7 +759,7 @@ idl_old_insert_key(

 		    (u_long)id, key.dptr, i);

 #endif

 		idl_unlock_list(a->ai_idl,key);

-		idl_free( idl );

+		idl_free( &idl );

 		return( 0 );

 	}

 	if ( i != 0 ) {

@@ -783,7 +783,7 @@ idl_old_insert_key(

 		LDAPDebug( LDAP_DEBUG_ANY,

 		    "nonexistent continuation block (%s)\n", k2.dptr, 0, 0 );

 		idl_unlock_list(a->ai_idl,key);

-		idl_free( idl );

+		idl_free( &idl );

 		slapi_ch_free((void**)&kstr );

 		return( -1 );

 	}

@@ -911,9 +911,9 @@ idl_old_insert_key(

 				slapi_ch_free( (void **)&(k2.dptr) );

 				slapi_ch_free( (void **)&(k3.dptr) );

-				idl_free( tmp );

-				idl_free( tmp2 );

-				idl_free( idl );

+				idl_free( &tmp );

+				idl_free( &tmp2 );

+				idl_free( &idl );

 				idl_unlock_list(a->ai_idl,key);

 				return( rc );

@@ -941,7 +941,7 @@ idl_old_insert_key(

                                  * which is not correct.

                                  */

                                 rc = 0;

-				idl_free( tmp2 );

+				idl_free( &tmp2 );

 				break;

 			}

 			if ( rc != 0 ) {

@@ -986,7 +986,7 @@ idl_old_insert_key(

 			/* store allid block in place of header block */

 			if ( 0 == rc ) {

-				idl_free( idl );

+				idl_free( &idl );

 				idl = idl_allids( be );

 				rc = idl_store( be, db, key, idl, txn );

 				if (NULL != disposition) {

@@ -996,14 +996,14 @@ idl_old_insert_key(

 			slapi_ch_free( (void **)&(k2.dptr) );

 			slapi_ch_free( (void **)&(k3.dptr) );

-			idl_free( idl );

-			idl_free( tmp );

+			idl_free( &idl );

+			idl_free( &tmp );

 			idl_unlock_list(a->ai_idl,key);

 			return( rc );

 		}

 		idl_split_block( tmp, id, &tmp2, &tmp3 );

-		idl_free( tmp );

+		idl_free( &tmp );

 		/* create a new updated indirect header block */

 		tmp = idl_alloc( idl->b_nmax + 1 );

@@ -1021,8 +1021,8 @@ idl_old_insert_key(

 		/* store the header block */

 		rc = idl_store( be, db, key, tmp, txn );

 		if ( rc != 0 ) {

-			idl_free( tmp2 );

-			idl_free( tmp3 );

+			idl_free( &tmp2 );

+			idl_free( &tmp3 );

 			break;

 		}

@@ -1033,8 +1033,8 @@ idl_old_insert_key(

 		k2.dsize = strlen( kstr ) + 1;

 		rc = idl_store( be, db, &k2, tmp2, txn );

 		if ( rc != 0 ) {

-			idl_free( tmp2 );

-			idl_free( tmp3 );

+			idl_free( &tmp2 );

+			idl_free( &tmp3 );

 			break;

 		}

@@ -1045,22 +1045,22 @@ idl_old_insert_key(

 		k2.dsize = strlen( kstr ) + 1;

 		rc = idl_store( be, db, &k2, tmp3, txn );

 		if ( rc != 0 ) {

-			idl_free( tmp2 );

-			idl_free( tmp3 );

+			idl_free( &tmp2 );

+			idl_free( &tmp3 );

 			break;

 		}

 		idl_check_indirect (tmp, i, tmp2, tmp3,

 				    "idl_insert_key", "indirect split", key, id);

-		idl_free( tmp2 );

-		idl_free( tmp3 );

+		idl_free( &tmp2 );

+		idl_free( &tmp3 );

 		break;

 	}

 	slapi_ch_free( (void **)&(k2.dptr) );

 	slapi_ch_free( (void **)&(k3.dptr) );

-	idl_free( tmp );

-	idl_free( idl );

+	idl_free( &tmp );

+	idl_free( &idl );

 	idl_unlock_list(a->ai_idl,key);

 	return( rc );

 }

@@ -1096,7 +1096,7 @@ int idl_old_store_block(

 			/* If so, store an ALLIDS block */

 			IDList *all = idl_allids(be);

 			ret = idl_store(be,db,key,all,txn);

-			idl_free(all);

+			idl_free(&all;;

 		} else {

 			/* Then , is it a block which is smaller than the size at which it needs splitting ? */

 			if (idl->b_nids <= (ID)priv->idl_maxids) {

@@ -1155,7 +1155,7 @@ int idl_old_store_block(

 					make_cont_key(&cont_key,key,lead_id);

 					/* Now store the continuation block */

 					ret = idl_store(be,db,&cont_key,this_cont_block,txn);

-					idl_free(this_cont_block);

+					idl_free(&this_cont_block);

 					slapi_ch_free(&(cont_key.data));

 					if ( ret != 0 && ret != DB_LOCK_DEADLOCK )

 					{

@@ -1177,7 +1177,7 @@ int idl_old_store_block(

 	}

 done:

 	/* Free master block */

-	idl_free(master_block);

+	idl_free(&master_block);

 	return ret;

 }

@@ -1438,7 +1438,7 @@ idl_old_delete_key(

 			break;

 		}

-		idl_free( idl );

+		idl_free( &idl );

 		idl_unlock_list(a->ai_idl,key);

 		LDAPDebug( LDAP_DEBUG_TRACE, "<= idl_delete_key(%s,%lu) %d (not indirect)\n",

 			   key->dptr, (u_long)id, rc );

@@ -1459,7 +1459,7 @@ idl_old_delete_key(

 	}

 	/* id smaller than smallest id - not there */

 	if ( i == 0 && id < idl->b_ids[i] ) {

-		idl_free( idl );

+		idl_free( &idl );

 		idl_unlock_list(a->ai_idl,key);

 		LDAPDebug( LDAP_DEBUG_TRACE, "<= idl_delete_key(%s,%lu) -666 (id not found)\n",

 			   key->dptr, (u_long)id, 0 );

@@ -1472,7 +1472,7 @@ idl_old_delete_key(

 	/* get the block to delete from */

 	make_cont_key( &contkey, key, idl->b_ids[i] );

 	if ( (didl = idl_fetch_one( li, db, &contkey, txn, &rc )) == NULL ) {

-		idl_free( idl );

+		idl_free( &idl );

 		idl_unlock_list(a->ai_idl,key);

 		if ( rc != DB_LOCK_DEADLOCK )

 		{

@@ -1559,8 +1559,8 @@ idl_old_delete_key(

 		rc = 0;

 		break;

 	}

-	idl_free( idl );

-	idl_free( didl );

+	idl_free( &idl );

+	idl_free( &didl );

 	slapi_ch_free( (void **)&(contkey.dptr) );

 	idl_unlock_list(a->ai_idl,key);

 	if ( rc != 0 && rc != DB_LOCK_DEADLOCK )

diff --git a/ldap/servers/slapd/back-ldbm/idl_common.c b/ldap/servers/slapd/back-ldbm/idl_common.c

index ee59ee2..216bfb0 100644

--- a/ldap/servers/slapd/back-ldbm/idl_common.c

+++ b/ldap/servers/slapd/back-ldbm/idl_common.c

@@ -85,13 +85,13 @@ idl_allids( backend *be )

 }

 void

-idl_free( IDList *idl ) /* JCM - pass in ** */

+idl_free( IDList **idl )

 {

-	if ( idl == NULL ) {

+	if ((NULL == idl) || (NULL == *idl)) {

 		return;

 	}

-	slapi_ch_free((void**)&idl );

+	slapi_ch_free((void**)idl);

 }

@@ -151,7 +151,7 @@ idl_append_extend(IDList **orig_idl, ID id)

 		/* copy over the existing contents */

 		idl_new->b_nids = idl->b_nids;

 		memcpy(idl_new->b_ids, idl->b_ids, sizeof(ID) * idl->b_nids);

-		idl_free(idl);

+		idl_free(&idl);

 		idl = idl_new;

 	}

@@ -243,7 +243,7 @@ idl_intersection(

 	}

 	if ( ni == 0 ) {

-		idl_free( n );

+		idl_free( &n );

 		return( NULL );

 	}

 	n->b_nids = ni;

@@ -355,7 +355,7 @@ idl_notin(

 		}

 		if ( ni == n->b_nmax ) {

-			idl_free( n );

+			idl_free( &n );

 			*new_result = idl_allids( be );

 		} else {

 			n->b_nids = ni;

diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c b/ldap/servers/slapd/back-ldbm/idl_new.c

index 936c19f..1591e84 100644

--- a/ldap/servers/slapd/back-ldbm/idl_new.c

+++ b/ldap/servers/slapd/back-ldbm/idl_new.c

@@ -277,7 +277,7 @@ IDList * idl_new_fetch(

             idl_rc = idl_append_extend(&idl, id);

             if (idl_rc) {

                 LDAPDebug(LDAP_DEBUG_ANY, "unable to extend id list (err=%d)\n", idl_rc, 0, 0);

-                idl_free(idl); idl = NULL;

+                idl_free(&idl);

                 goto error;

             }

@@ -314,7 +314,7 @@ IDList * idl_new_fetch(

         idl_rc = idl_append_extend(&idl, id);

         if (idl_rc) {

             LDAPDebug(LDAP_DEBUG_ANY, "unable to extend id list (err=%d)\n", idl_rc);

-            idl_free(idl); idl = NULL;

+            idl_free(&idl);

             goto error;

         }

 #if defined(DB_ALLIDS_ON_READ)	

@@ -330,7 +330,7 @@ IDList * idl_new_fetch(

 #endif

     if (ret != DB_NOTFOUND) {

-        idl_free(idl); idl = NULL;

+        idl_free(&idl);

         ldbm_nasty(filename,59,ret);

         goto error;

     }

@@ -339,7 +339,7 @@ IDList * idl_new_fetch(

     /* check for allids value */

     if (idl != NULL && idl->b_nids == 1 && idl->b_ids[0] == ALLID) {

-        idl_free(idl);

+        idl_free(&idl);

         idl = idl_allids(be);

         LDAPDebug(LDAP_DEBUG_TRACE, "idl_new_fetch %s returns allids\n", 

                   key.data, 0, 0);

diff --git a/ldap/servers/slapd/back-ldbm/import-merge.c b/ldap/servers/slapd/back-ldbm/import-merge.c

index 9d7af3e..e01bf88 100644

--- a/ldap/servers/slapd/back-ldbm/import-merge.c

+++ b/ldap/servers/slapd/back-ldbm/import-merge.c

@@ -169,8 +169,8 @@ static int import_merge_insert_input_queue(backend *be, import_merge_queue_entry

                     IDList *new_idl =

                         idl_union(be, current_entry->thang.payload.idl, idl);

-                    idl_free(current_entry->thang.payload.idl);

-                    idl_free(idl);

+                    idl_free(&(current_entry->thang.payload.idl));

+                    idl_free(&idl);

                     current_entry->thang.payload.idl = new_idl;

                     /* Add this file id into the entry's referenced list */

                     (current_entry->file_referenced_list)[fileno] = 1;

@@ -567,7 +567,7 @@ static int import_merge_one_file(ImportWorkerInfo *worker, int passes,

 		    ret = idl_store_block(be, output_file, &key,