From: Howard Chu <hyc@openldap.org>
Date: Wed, 18 Nov 2009 23:58:39 +0000 (+0000)
Subject: ITS#6387 plug leaks
X-Git-Tag: ACLCHECK_0~99
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ddfe3cde10ce4fc3f98b62aeb27a2c83ddfb5bc3;p=openldap

ITS#6387 plug leaks
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 488079a01c..b0f2763ce5 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -823,6 +823,7 @@ static int
 merge_entry(
 	Operation		*op,
 	Entry			*e,
+	int			dup,
 	struct berval*		query_uuid )
 {
 	int		rc;
@@ -836,7 +837,8 @@ merge_entry(
 
 	slap_callback cb = { NULL, slap_null_cb, NULL, NULL };
 
-	e = entry_dup( e );
+	if ( dup )
+		e = entry_dup( e );
 	attr = e->e_attrs;
 	e->e_attrs = NULL;
 
@@ -2286,7 +2288,7 @@ cache_entries(
 			remove_query_and_data( op_tmp, rs, cm, &crp_uuid );
 		}
 
-		return_val = merge_entry(op_tmp, e, query_uuid);
+		return_val = merge_entry(op_tmp, e, 0, query_uuid);
 		ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
 		cm->cur_entries += return_val;
 		Debug( pcache_debug,
@@ -2473,6 +2475,12 @@ pcache_response(
 				&& si->qtemp->limitttl )
 			{
 				si->caching_reason = PC_SIZELIMIT;
+				Entry *e;
+				for (;si->head; si->head=e) {
+					e = si->head->e_private;
+					si->head->e_private = NULL;
+					entry_free(si->head);
+				}
 			}
 
 		} else if ( si->qtemp->negttl && !si->count && !si->over &&
@@ -3191,7 +3199,7 @@ refresh_merge( Operation *op, SlapReply *rs )
 			/* No local entry, just add it. FIXME: we are not checking
 			 * the cache entry limit here
 			 */
-			 merge_entry( op, rs->sr_entry, &ri->ri_q->q_uuid );
+			 merge_entry( op, rs->sr_entry, 1, &ri->ri_q->q_uuid );
 		} else {
 			/* Entry exists, update it */
 			Entry ne;