[Pkg-openldap-devel] r771 - in openldap/trunk-2.3/debian: . patches

[Matthijs Mohlmann]

Author: matthijs
Date: 2006-12-23 22:38:53 +0100 (Sat, 23 Dec 2006)
New Revision: 771

Added:
   openldap/trunk-2.3/debian/patches/fix-memleak-acls-uses-sets
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
Log:
 * Added patch that fixes a memory leak in ACLs that use sets.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-12-23 12:42:51 UTC (rev 770)
+++ openldap/trunk-2.3/debian/changelog	2006-12-23 21:38:53 UTC (rev 771)
@@ -1,12 +1,13 @@
-openldap2.3 (2.3.30-3) unstable; urgency=low
+openldap2.3 (2.3.30-3) unstable; urgency=medium
 
   * Added spanish translation. (Closes: #404250)
   * Documentation updates backported from upstream.
   * Fix a security bug in kerberos kbind code. (Only used when enabling with
     --enable-kbind option) But better safe then sorry.
   * Backported a mem leak fix on failed binds.
+  * Added patch from upstream that fixes a memory leak in ACLs that use sets.
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 23 Dec 2006 13:23:18 +0100
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 23 Dec 2006 22:37:45 +0100
 
 openldap2.3 (2.3.30-2) unstable; urgency=low
 

Added: openldap/trunk-2.3/debian/patches/fix-memleak-acls-uses-sets
===================================================================
--- openldap/trunk-2.3/debian/patches/fix-memleak-acls-uses-sets	2006-12-23 12:42:51 UTC (rev 770)
+++ openldap/trunk-2.3/debian/patches/fix-memleak-acls-uses-sets	2006-12-23 21:38:53 UTC (rev 771)
@@ -0,0 +1,37 @@
+Index: servers/slapd/sets.c
+===================================================================
+--- servers/slapd/sets.c.orig
++++ servers/slapd/sets.c
+@@ -265,10 +265,14 @@
+ 
+ done:;
+ 	if ( !( op_flags & SLAP_SET_LREFARR ) && lset != NULL ) {
++		if ( !( op_flags & SLAP_SET_LREFVAL ))
++			cp->set_op->o_tmpfree( lset->bv_val, cp->set_op->o_tmpmemctx );
+ 		cp->set_op->o_tmpfree( lset, cp->set_op->o_tmpmemctx );
+ 	}
+ 
+ 	if ( !( op_flags & SLAP_SET_RREFARR ) && rset != NULL ) {
++		if ( !( op_flags & SLAP_SET_RREFVAL ))
++			cp->set_op->o_tmpfree( rset->bv_val, cp->set_op->o_tmpmemctx );
+ 		cp->set_op->o_tmpfree( rset, cp->set_op->o_tmpmemctx );
+ 	}
+ 
+@@ -299,7 +303,7 @@
+ 		return NULL;
+ 	}
+ 	for ( i = 0; !BER_BVISNULL( &set[ i ] ); i++ ) {
+-		vals = (gatherer)( cp, &set[ i ], desc );
++		vals = gatherer( cp, &set[ i ], desc );
+ 		if ( vals != NULL ) {
+ 			nset = slap_set_join( cp, nset, '|', vals );
+ 		}
+@@ -308,7 +312,7 @@
+ 
+ 	if ( closure ) {
+ 		for ( i = 0; !BER_BVISNULL( &nset[ i ] ); i++ ) {
+-			vals = (gatherer)( cp, &nset[ i ], desc );
++			vals = gatherer( cp, &nset[ i ], desc );
+ 			if ( vals != NULL ) {
+ 				nset = slap_set_join( cp, nset, '|', vals );
+ 				if ( nset == NULL ) {

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-12-23 12:42:51 UTC (rev 770)
+++ openldap/trunk-2.3/debian/patches/series	2006-12-23 21:38:53 UTC (rev 771)
@@ -17,3 +17,4 @@
 adminguide-docfixes -p0
 kbind-security-fix -p0
 fix-memleak-on-failed-bind -p0
+fix-memleak-acls-uses-sets -p0