From f0c9d7732683b148e6df5a09683e4583fdd3d1fa Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 8 Nov 2011 16:45:45 -0800 Subject: [PATCH] Fix mdb_drop return --- libraries/libmdb/mdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index 32f50fe..f3adb66 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -5910,8 +5910,7 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del) rc = mdb_drop0(mc, mc->mc_db->md_flags & MDB_DUPSORT); if (rc) - mdb_cursor_close(mc); - return rc; + goto leave; /* Can't delete the main DB */ if (del && dbi > MAIN_DBI) { @@ -5927,6 +5926,7 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del) txn->mt_dbs[dbi].md_entries = 0; txn->mt_dbs[dbi].md_root = P_INVALID; } +leave: mdb_cursor_close(mc); return rc; }