mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7377 Catch MDB failure updating root pointers.

Browse Source 
"cannot fail" was wrong, it fails at least when exceeding mapsize.
This commit is contained in:
Hallvard Furuseth 2013-02-16 19:08:54 +01:00
parent c7db955a94
commit d90581fa5a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/liblmdb/mdb.c
View File

@ -2124,9 +2124,7 @@ mdb_txn_commit(MDB_txn *txn)
DPRINTF("committing txn %zu %p on mdbenv %p, root page %zu", DPRINTF("committing txn %zu %p on mdbenv %p, root page %zu",
txn->mt_txnid, (void *)txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root); txn->mt_txnid, (void *)txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root);
/* Update DB root pointers. Their pages have already been /* Update DB root pointers */
* touched so this is all in-place and cannot fail.
*/
if (txn->mt_numdbs > 2) { if (txn->mt_numdbs > 2) {
MDB_dbi i; MDB_dbi i;
MDB_val data; MDB_val data;
@ -2136,7 +2134,9 @@ mdb_txn_commit(MDB_txn *txn)
for (i = 2; i < txn->mt_numdbs; i++) { for (i = 2; i < txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_DIRTY) { if (txn->mt_dbflags[i] & DB_DIRTY) {
data.mv_data = &txn->mt_dbs[i]; data.mv_data = &txn->mt_dbs[i];
mdb_cursor_put(&mc, &txn->mt_dbxs[i].md_name, &data, 0); rc = mdb_cursor_put(&mc, &txn->mt_dbxs[i].md_name, &data, 0);
if (rc)
goto fail;
} }
} }
} }