From c668f5acda86b8c2d42cb03f4eceaa509cd9c0a3 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 15 May 2018 17:38:50 +0200
Subject: Try a bit harder to ensure that env always has a sane value.

---
 common/storage_lmdb.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 227d52e..a8c5cc7 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -562,6 +562,7 @@ public:
     {
         Q_ASSERT(!transaction);
         Q_ASSERT(sEnvironments.values().contains(env));
+        Q_ASSERT(env);
         // auto f = [](const char *msg, void *ctx) -> int {
         //     qDebug() << msg;
         //     return 0;
@@ -816,7 +817,7 @@ public:
     QString storageRoot;
     QString name;
 
-    MDB_env *env;
+    MDB_env *env = nullptr;
     AccessMode mode;
     Sink::Log::Context logCtx;
 
@@ -833,6 +834,7 @@ public:
                 if ((rc = mdb_env_create(&env))) {
                     SinkWarningCtx(logCtx) << "mdb_env_create: " << rc << " " << mdb_strerror(rc);
                     qCritical() << "mdb_env_create: " << rc << " " << mdb_strerror(rc);
+                    env = nullptr;
                 } else {
                     //Limit large enough to accomodate all our named dbs. This only starts to matter if the number gets large, otherwise it's just a bunch of extra entries in the main table.
                     mdb_env_set_maxdbs(env, 50);
-- 
cgit v1.2.3