From: Howard Chu <hyc@openldap.org>
Date: Thu, 13 Aug 2020 17:17:45 +0000 (+0100)
Subject: ITS#9135 fix index error on collapsed range
X-Git-Tag: OPENLDAP_REL_ENG_2_4_52~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce6d302c0a2b0e6e46d975dcf81ff5e3cd028c28;p=thirdparty%2Fopenldap.git

ITS#9135 fix index error on collapsed range
---

diff --git a/servers/slapd/back-mdb/idl.c b/servers/slapd/back-mdb/idl.c
index 735de653c6..26a6373c30 100644
--- a/servers/slapd/back-mdb/idl.c
+++ b/servers/slapd/back-mdb/idl.c
@@ -625,9 +625,30 @@ mdb_idl_delete_keys(
 				}
 				if ( lo2 >= hi2 ) {
 				/* The range has collapsed... */
-					rc = mdb_cursor_del( cursor, MDB_NODUPDATA );
+					/* delete the range marker */
+					rc = mdb_cursor_del( cursor, 0 );
 					if ( rc != 0 ) {
-						err = "c_del dup";
+						err = "c_del dup1";
+						goto fail;
+					}
+					/* skip past deleted marker */
+					rc = mdb_cursor_get( cursor, &key, &data, MDB_NEXT_DUP );
+					if ( rc != 0 ) {
+						err = "c_get dup1";
+						goto fail;
+					}
+					/* delete the requested id */
+					if ( id == hi ) {
+						/* skip lo */
+						rc = mdb_cursor_get( cursor, &key, &data, MDB_NEXT_DUP );
+						if ( rc != 0 ) {
+							err = "c_get dup2";
+							goto fail;
+						}
+					}
+					rc = mdb_cursor_del( cursor, 0 );
+					if ( rc != 0 ) {
+						err = "c_del dup2";
 						goto fail;
 					}
 				} else {