From 6a1ee5feec7ed52f1ab60efc0e14f81b6d81ea74 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 12 Jan 2017 13:35:31 +0000 Subject: [PATCH] Fix f8ce8a82717ddefdc912fa47c07f1bdee2a3336b GET_MULTIPLE was broken --- libraries/liblmdb/mdb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index fdc36bf..2c34383 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -6345,10 +6345,9 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data, rc = MDB_INCOMPATIBLE; break; } - if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) { - rc = EINVAL; + rc = MDB_SUCCESS; + if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) 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) { @@ -6357,7 +6356,6 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data, } mx->mc_flags ^= C_EOF; } - rc = MDB_SUCCESS; goto fetchm; case MDB_NEXT_MULTIPLE: if (data == NULL) {