From: Howard Chu <hyc@openldap.org>
Date: Tue, 13 Jan 2015 18:47:18 +0000 (+0000)
Subject: Fix potential null deref (coverity)
X-Git-Tag: LMDB_0.9.15~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea80418cfcf64f66768c80a52c24ffdee0d53436;p=openldap

Fix potential null deref (coverity)
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 5f287f4b18..ab3b3a0d5e 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -4647,13 +4647,15 @@ mdb_env_close0(MDB_env *env, int excl)
 		return;
 
 	/* Doing this here since me_dbxs may not exist during mdb_env_close */
-	for (i = env->me_maxdbs; --i > MAIN_DBI; )
-		free(env->me_dbxs[i].md_name.mv_data);
+	if (env->me_dbxs) {
+		for (i = env->me_maxdbs; --i > MAIN_DBI; )
+			free(env->me_dbxs[i].md_name.mv_data);
+		free(env->me_dbxs);
+	}
 
 	free(env->me_pbuf);
 	free(env->me_dbiseqs);
 	free(env->me_dbflags);
-	free(env->me_dbxs);
 	free(env->me_path);
 	free(env->me_dirty_list);
 	free(env->me_txn0);
@@ -7456,7 +7458,7 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
 			cdst->mc_ki[cdst->mc_top] = 0;
 			rc = mdb_update_key(cdst, &nullkey);
 			cdst->mc_ki[cdst->mc_top] = ix;
-			mdb_cassert(csrc, rc == MDB_SUCCESS);
+			mdb_cassert(cdst, rc == MDB_SUCCESS);
 		}
 	}