txn_commit must abort txn before returning errors

Fix for failure when committing a txn that is a child of
some parent txn.

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 9480a4339ef75e6ad974b07383848987d2ad95c5..cd0e810bae63becbd76e95497524348dbaf95022 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -1737,8 +1737,10 @@ mdb_txn_commit(MDB_txn *txn)
                }
                x = dst[0].mid;
                for (; y<=src[0].mid; y++) {
-                       if (++x >= MDB_IDL_UM_MAX)
+                       if (++x >= MDB_IDL_UM_MAX) {
+                               mdb_txn_abort(txn);
                                return ENOMEM;
+                       }
                        dst[x] = src[y];
                }
                dst[0].mid = x;

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index c40a5e9e286fbaab090ca3fd1743d5c4cce39f57..5682c8f8685fcc92a848ed8d77252cb3bc81a838 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -530,6 +530,7 @@ int  mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **
         *      <li>EINVAL - an invalid parameter was specified.
         *      <li>ENOSPC - no more disk space.
         *      <li>EIO - a low-level I/O error occurred while writing.
+        *      <li>ENOMEM - the transaction is nested and could not be merged into its parent.
         * </ul>
         */
 int  mdb_txn_commit(MDB_txn *txn);