upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7515 mdb_pages_xkeep(): Careful about xcursors.

Browse source 
Don't prod sub-pages or pages referring to uninitialized xcursors.
This commit is contained in:
Hallvard Furuseth 2013-09-23 20:13:27 +02:00
parent 5b96d68faf
commit cfe262dce9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/liblmdb/mdb.c
View file

@ -1381,6 +1381,7 @@ mdb_pages_xkeep(MDB_cursor *mc, unsigned pflags, int all)
MDB_cursor *m3; MDB_cursor *m3;
MDB_xcursor *mx; MDB_xcursor *mx;
MDB_page *dp, *mp; MDB_page *dp, *mp;
MDB_node *leaf;
unsigned i, j; unsigned i, j;
int rc = MDB_SUCCESS, level; int rc = MDB_SUCCESS, level;
@ -1389,14 +1390,23 @@ mdb_pages_xkeep(MDB_cursor *mc, unsigned pflags, int all)
mc = NULL; /* will find mc in mt_cursors */ mc = NULL; /* will find mc in mt_cursors */
for (i = txn->mt_numdbs;; mc = txn->mt_cursors[--i]) { for (i = txn->mt_numdbs;; mc = txn->mt_cursors[--i]) {
for (; mc; mc=mc->mc_next) { for (; mc; mc=mc->mc_next) {
for (m3 = mc; m3->mc_flags & C_INITIALIZED; m3 = &mx->mx_cursor) { if (!(mc->mc_flags & C_INITIALIZED))
continue;
for (m3 = mc;; m3 = &mx->mx_cursor) {
mp = NULL;
for (j=0; j<m3->mc_snum; j++) { for (j=0; j<m3->mc_snum; j++) {
mp = m3->mc_pg[j]; mp = m3->mc_pg[j];
if ((mp->mp_flags & Mask) == pflags) if ((mp->mp_flags & Mask) == pflags)
mp->mp_flags ^= P_KEEP; mp->mp_flags ^= P_KEEP;
} }
mx = m3->mc_xcursor; mx = m3->mc_xcursor;
if (mx == NULL) /* Proceed to mx if it is at a sub-database */
if (! (mx && (mx->mx_cursor.mc_flags & C_INITIALIZED)))
break;
if (! (mp && (mp->mp_flags & P_LEAF)))
break;
leaf = NODEPTR(mp, m3->mc_ki[j-1]);
if (!(leaf->mn_flags & F_SUBDATA))
break; break;
} }
} }