From: Howard Chu Date: Fri, 1 Feb 2013 04:05:48 +0000 (-0800) Subject: ITS#7515 fix mdb_dbi_open/close X-Git-Tag: OPENLDAP_REL_ENG_2_4_34~3^2~25 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48dc782ea612f85e8356a50bfbafe22e5be121cf;p=openldap ITS#7515 fix mdb_dbi_open/close If a DBI handle is opened by a txn that aborts, the DBI handle should no longer be valid. --- diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index cdd8ea104e..578e6b6979 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -1947,6 +1947,11 @@ static void mdb_txn_reset0(MDB_txn *txn) { MDB_env *env = txn->mt_env; + unsigned int i; + + /* If there were uncommitted dbi_opens, undo them now */ + for (i=env->me_numdbs; imt_numdbs; i++) + mdb_dbi_close(env, i); if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) { if (!(env->me_flags & MDB_ROFS)) @@ -1954,7 +1959,6 @@ mdb_txn_reset0(MDB_txn *txn) } else { MDB_oldpages *mop; MDB_page *dp; - unsigned int i; /* close(free) all cursors */ for (i=0; imt_numdbs; i++) { @@ -7047,7 +7051,6 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *db mdb_default_cmp(txn, slot); if (!unused) { txn->mt_numdbs++; - txn->mt_env->me_numdbs++; } } @@ -7065,8 +7068,12 @@ int mdb_stat(MDB_txn *txn, MDB_dbi dbi, MDB_stat *arg) void mdb_dbi_close(MDB_env *env, MDB_dbi dbi) { char *ptr; - if (dbi <= MAIN_DBI || dbi >= env->me_numdbs) + if (dbi <= MAIN_DBI || dbi >= env->me_maxdbs) return; + /* If the dbi is greater than env->me_numdbs, no harm is done. + * And it may happen if we're closing a DB that was just opened, + * but the opening txn hadn't committed yet. + */ ptr = env->me_dbxs[dbi].md_name.mv_data; env->me_dbxs[dbi].md_name.mv_data = NULL; env->me_dbxs[dbi].md_name.mv_size = 0;