ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 15:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix segfault and double-free (in case twice abortion of the same write-txn).

Browse Source
This commit is contained in:
Leo Yuriev
2017-05-25 18:37:47 +03:00
parent 96de36baef
commit b9dbe7c577
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mdbx.c
View File

@@ -2345,27 +2345,29 @@ uint64_t mdbx_txn_id(MDBX_txn *txn) {
/* Export or close DBI handles opened in this txn. */ /* Export or close DBI handles opened in this txn. */
static void mdbx_dbis_update(MDBX_txn *txn, int keep) { static void mdbx_dbis_update(MDBX_txn *txn, int keep) {
MDBX_dbi n = txn->mt_numdbs; MDBX_dbi n = txn->mt_numdbs;
MDBX_env *env = txn->mt_env; if (n) {
uint8_t *tdbflags = txn->mt_dbflags; MDBX_env *env = txn->mt_env;
uint8_t *tdbflags = txn->mt_dbflags;
for (unsigned i = n; --i >= CORE_DBS;) { for (unsigned i = n; --i >= CORE_DBS;) {
if (tdbflags[i] & DB_NEW) { if (tdbflags[i] & DB_NEW) {
if (keep) { if (keep) {
env->me_dbflags[i] = txn->mt_dbs[i].md_flags | MDBX_VALID; env->me_dbflags[i] = txn->mt_dbs[i].md_flags | MDBX_VALID;
} else { } else {
char *ptr = env->me_dbxs[i].md_name.iov_base; char *ptr = env->me_dbxs[i].md_name.iov_base;
if (ptr) { if (ptr) {
env->me_dbxs[i].md_name.iov_base = NULL; env->me_dbxs[i].md_name.iov_base = NULL;
env->me_dbxs[i].md_name.iov_len = 0; env->me_dbxs[i].md_name.iov_len = 0;
env->me_dbflags[i] = 0; env->me_dbflags[i] = 0;
env->me_dbiseqs[i]++; env->me_dbiseqs[i]++;
free(ptr); free(ptr);
}
} }
} }
} }
if (keep && env->me_numdbs < n)
env->me_numdbs = n;
} }
if (keep && env->me_numdbs < n)
env->me_numdbs = n;
} }
/* End a transaction, except successful commit of a nested transaction. /* End a transaction, except successful commit of a nested transaction.
@@ -2447,7 +2449,8 @@ static int mdbx_txn_end(MDBX_txn *txn, unsigned mode) {
if (mode & MDBX_END_FREE) { if (mode & MDBX_END_FREE) {
txn->mt_signature = 0; txn->mt_signature = 0;
free(txn); if (txn != env->me_txn0)
free(txn);
} }
return MDBX_SUCCESS; return MDBX_SUCCESS;