upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-11 01:12:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Plug txn leak and MDB_NOTLS slot leaks on error.

Browse source 
On mdb_env_copy() error: Abort the txn.
On mdb_txn_renew0() error: Release new MDB_NOTLS reader slot.
This commit is contained in:
Hallvard Furuseth 2013-05-04 12:31:31 +02:00
parent f45d40a88b
commit dca0cef678
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/liblmdb/mdb.c
View file

@ -1782,7 +1782,7 @@ mdb_txn_renew0(MDB_txn *txn)
MDB_env *env = txn->mt_env;
unsigned int i;
uint16_t x;
int rc;
int rc, new_notls = 0;
/* Setup db info */
txn->mt_numdbs = env->me_numdbs;
@ -1819,9 +1819,9 @@ mdb_txn_renew0(MDB_txn *txn)
env->me_numreaders = env->me_txns->mti_numreaders;
UNLOCK_MUTEX_R(env);
r = &env->me_txns->mti_readers[i];
if (!(env->me_flags & MDB_NOTLS) &&
(rc = pthread_setspecific(env->me_txkey, r)) != 0) {
env->me_txns->mti_readers[i].mr_pid = 0;
new_notls = (env->me_flags & MDB_NOTLS);
if (!new_notls && (rc=pthread_setspecific(env->me_txkey, r))) {
r->mr_pid = 0;
return rc;
}
}
@ -1860,6 +1860,10 @@ mdb_txn_renew0(MDB_txn *txn)
if (env->me_maxpg < txn->mt_next_pgno) {
mdb_txn_reset0(txn);
if (new_notls) {
txn->mt_u.reader->mr_pid = 0;
txn->mt_u.reader = NULL;
}
return MDB_MAP_RESIZED;
}
@ -3745,9 +3749,9 @@ mdb_env_copy(MDB_env *env, const char *path)
ptr += wres;
}
#endif
mdb_txn_abort(txn);
leave:
mdb_txn_abort(txn);
if (newfd != INVALID_HANDLE_VALUE)
close(newfd);