From 65c053a6e7f6973c1d09710aa1bd57b218206fcb Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Thu, 7 Feb 2013 08:17:30 +0100 Subject: [PATCH] ITS#7512 Fix MDB page leak when malloc error. mdb_page_alloc(): Delay moving me_pgfirst,me_pglast until malloc(MDB_oldpages to hold the IDs) succeeds. --- libraries/liblmdb/mdb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 1bd472f..68f6083 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -1341,19 +1341,24 @@ again: if (!txn->mt_env->me_pgfirst) { mdb_node_read(txn, leaf, &data); } - txn->mt_env->me_pglast = last; - if (!txn->mt_env->me_pgfirst) - txn->mt_env->me_pgfirst = last; idl = (MDB_ID *) data.mv_data; /* We might have a zero-length IDL due to freelist growth * during a prior commit */ - if (!idl[0]) goto again; + if (!idl[0]) { + txn->mt_env->me_pglast = last; + if (!txn->mt_env->me_pgfirst) + txn->mt_env->me_pgfirst = last; + goto again; + } mop = malloc(sizeof(MDB_oldpages) + MDB_IDL_SIZEOF(idl) - sizeof(pgno_t)); if (!mop) return ENOMEM; mop->mo_next = txn->mt_env->me_pghead; mop->mo_txnid = last; + txn->mt_env->me_pglast = last; + if (!txn->mt_env->me_pgfirst) + txn->mt_env->me_pgfirst = last; txn->mt_env->me_pghead = mop; memcpy(mop->mo_pages, idl, MDB_IDL_SIZEOF(idl));