mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix f8ce8a8271

Browse Source 
GET_MULTIPLE was broken
This commit is contained in:
Howard Chu 2017-01-12 13:35:31 +00:00
parent 65b4c49dd3
commit 6a1ee5feec
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/liblmdb/mdb.c
View File

@ -6345,10 +6345,9 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
rc = MDB_INCOMPATIBLE; rc = MDB_INCOMPATIBLE;
break; break;
} }
if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) { rc = MDB_SUCCESS;
rc = EINVAL; if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED))
break; break;
}
if (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF) { if (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF) {
MDB_cursor *mx = &mc->mc_xcursor->mx_cursor; MDB_cursor *mx = &mc->mc_xcursor->mx_cursor;
if (mx->mc_ki[mx->mc_top] >= NUMKEYS(mx->mc_pg[mx->mc_top])-1) { if (mx->mc_ki[mx->mc_top] >= NUMKEYS(mx->mc_pg[mx->mc_top])-1) {
@ -6357,7 +6356,6 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
} }
mx->mc_flags ^= C_EOF; mx->mc_flags ^= C_EOF;
} }
rc = MDB_SUCCESS;
goto fetchm; goto fetchm;
case MDB_NEXT_MULTIPLE: case MDB_NEXT_MULTIPLE:
if (data == NULL) { if (data == NULL) {