From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 6 Jun 2002 02:35:24 +0000 (+0000)
Subject: ITS#1570: IDL patch
X-Git-Tag: OPENLDAP_REL_ENG_2_0_24~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=216bc238a0053d5beebb8710d8269eb7611df658;p=thirdparty%2Fopenldap.git

ITS#1570: IDL patch
---

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index 76b627e4c4..3ce22f6fb3 100644
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -922,6 +922,9 @@ idl_intersection(
 #endif
 
 	for ( ni = 0, ai = 0, bi = 0; ai < ID_BLOCK_NIDS(a); ai++ ) {
+		if ( ID_BLOCK_ID(a, ai) < ID_BLOCK_ID(b, bi) ) {
+			continue;
+		}
 		for ( ;
 			bi < ID_BLOCK_NIDS(b) && ID_BLOCK_ID(b, bi) < ID_BLOCK_ID(a, ai);
 			bi++ )
@@ -935,6 +938,7 @@ idl_intersection(
 
 		if ( ID_BLOCK_ID(b, bi) == ID_BLOCK_ID(a, ai) ) {
 			ID_BLOCK_ID(n, ni++) = ID_BLOCK_ID(a, ai);
+			bi++;
 		}
 	}