From 9049efe4933b35250a5406f746731ed9f60db60d Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 14 Jul 2014 09:51:16 -0700 Subject: [PATCH 1/4] ITS#7896 fix for mdb_env_map Don't pass non-NULL map address unless MDB_FIXEDMAP was used. --- libraries/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index f8c94e3100..4a21242239 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -3841,7 +3841,7 @@ mdb_env_open2(MDB_env *env) env->me_flags |= MDB_RESIZING; } - rc = mdb_env_map(env, meta.mm_address); + rc = mdb_env_map(env, (flags & MDB_FIXEDMAP) ? meta.mm_address : NULL); if (rc) return rc; From 204637b18d74e84c100e749ca3e7f2d5fecab01a Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 14 Jul 2014 09:53:53 -0700 Subject: [PATCH 2/4] Typo --- libraries/liblmdb/CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index 6eac674b69..644b18de97 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -8,7 +8,7 @@ LMDB 0.9.14 Engineering Fix ambiguous error code from writing to closed DBI (ITS#7825) Fix mdb_copy copying past end of file (ITS#7886) Fix cursor bugs from page_merge/rebalance - Fix to dirty fewer pages in deletes (mdb_page_loose() + Fix to dirty fewer pages in deletes (mdb_page_loose()) Fix Windows compat issues in mtests (ITS#7879) Add compacting variant of mdb_copy Add BigEndian integer key compare code From fcb0768e7d74e62fcb4158aadaf48ebbe0d73272 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 21 Jul 2014 08:11:33 -0700 Subject: [PATCH 3/4] Silence prototype warnings --- libraries/liblmdb/mdb_load.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c index 7a76d3c005..268fe0db54 100644 --- a/libraries/liblmdb/mdb_load.c +++ b/libraries/liblmdb/mdb_load.c @@ -66,7 +66,7 @@ flagbit dbflags[] = { static const char hexc[] = "0123456789abcdef"; -static void readhdr() +static void readhdr(void) { char *ptr; @@ -155,7 +155,7 @@ static void readhdr() } } -static void badend() +static void badend(void) { fprintf(stderr, "%s: line %" Z "d: unexpected end of input\n", prog, lineno); @@ -274,7 +274,7 @@ badend: return 0; } -static void usage() +static void usage(void) { fprintf(stderr, "usage: %s dbpath [-V] [-f input] [-n] [-s name] [-N] [-T]\n", prog); exit(EXIT_FAILURE); @@ -294,7 +294,7 @@ int main(int argc, char *argv[]) prog = argv[0]; if (argc < 2) { - usage(prog); + usage(); } /* -f: load file instead of stdin @@ -330,12 +330,12 @@ int main(int argc, char *argv[]) mode |= NOHDR; break; default: - usage(prog); + usage(); } } if (optind != argc - 1) - usage(prog); + usage(); dbuf.mv_size = 4096; dbuf.mv_data = malloc(dbuf.mv_size); From 58e9c3add8c3fbe88f930531f237f070a652249b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 21 Jul 2014 08:33:59 -0700 Subject: [PATCH 4/4] Fix mdb_cursor_count, reject uninit'd cursor --- libraries/liblmdb/mdb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 4a21242239..9e4a068941 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -6989,6 +6989,9 @@ mdb_cursor_count(MDB_cursor *mc, size_t *countp) if (mc->mc_txn->mt_flags & MDB_TXN_ERROR) return MDB_BAD_TXN; + if (!(mc->mc_flags & C_INITIALIZED)) + return EINVAL; + leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) { *countp = 1;