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

Fix valgrind call after malloc failure in mdb.

Browse source 
Also line up the code logic a bit.
This commit is contained in:
Hallvard Furuseth 2012-03-09 19:22:31 +01:00
parent d3b9939e71
commit 5c182fbedf
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libmdb/mdb.c
View file

@ -1126,13 +1126,11 @@ static MDB_page *
mdb_page_malloc(MDB_cursor *mc) {
MDB_page *ret;
size_t sz = mc->mc_txn->mt_env->me_psize;
if (mc->mc_txn->mt_env->me_dpages) {
ret = mc->mc_txn->mt_env->me_dpages;
if ((ret = mc->mc_txn->mt_env->me_dpages) != NULL) {
VGMEMP_ALLOC(mc->mc_txn->mt_env, ret, sz);
VGMEMP_DEFINED(ret, sizeof(ret->mp_next));
mc->mc_txn->mt_env->me_dpages = ret->mp_next;
} else {
ret = malloc(sz);
} else if ((ret = malloc(sz)) != NULL) {
VGMEMP_ALLOC(mc->mc_txn->mt_env, ret, sz);
}
return ret;