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

Further fix f8ce8a8271

Browse source 
Fully revert the change to GET_MULTIPLE
This commit is contained in:
Howard Chu 2017-01-14 19:22:34 +00:00
parent 2e1d10472c
commit a87c8fd8c9
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/liblmdb/mdb.c
View file

@ -6346,16 +6346,9 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
break; break;
} }
rc = MDB_SUCCESS; rc = MDB_SUCCESS;
if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) ||
(mc->mc_xcursor->mx_cursor.mc_flags & C_EOF))
break; break;
if (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF) {
MDB_cursor *mx = &mc->mc_xcursor->mx_cursor;
if (mx->mc_ki[mx->mc_top] >= NUMKEYS(mx->mc_pg[mx->mc_top])-1) {
rc = MDB_NOTFOUND;
break;
}
mx->mc_flags ^= C_EOF;
}
goto fetchm; goto fetchm;
case MDB_NEXT_MULTIPLE: case MDB_NEXT_MULTIPLE:
if (data == NULL) { if (data == NULL) {