From: Howard Chu <hyc@symas.com>
Date: Thu, 7 Nov 2013 17:37:48 +0000 (-0800)
Subject: Fix prev commit, cursor depth comparison
X-Git-Tag: OPENLDAP_REL_ENG_2_4_38~8^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=550bbe3788fafdf0fddcb2130173c1349fbc477f;hp=4a1717708cf1127c3d5d9f4101af69d67d8296d7;p=openldap

Fix prev commit, cursor depth comparison
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 44ce73e8b5..7a8ca3fde6 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7291,12 +7291,10 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
 
 		/* Adjust other cursors pointing to mp */
 		for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2=m2->mc_next) {
-			if (m2 == mc)
+			if (m2 == mc || m2->mc_snum < mc->mc_snum)
 				continue;
 			if (!(m2->mc_flags & C_INITIALIZED))
 				continue;
-			if (m2->mc_top < mc->mc_top)
-				continue;
 			if (m2->mc_pg[mc->mc_top] == mp) {
 				if (m2->mc_ki[mc->mc_top] >= ki) {
 					m2->mc_flags |= C_DEL;