Fix segfault when non intialized ITF was destructed (hyperledger-iroh…

…a#1353) Signed-off-by: Igor Egorov <[email protected]>
AndreyAndreyev · May 18, 2018 · f030fcc · f030fcc
1 parent 5c0631a
commit f030fcc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/test/framework/integration_framework/integration_test_framework.cpp b/test/framework/integration_framework/integration_test_framework.cpp
@@ -229,6 +229,8 @@ namespace integration_framework {
 
   void IntegrationTestFramework::done() {
     log_->info("done");
-    iroha_instance_->instance_->storage->dropStorage();
+    if (iroha_instance_->instance_ and iroha_instance_->instance_->storage) {
+      iroha_instance_->instance_->storage->dropStorage();
+    }
   }
 }  // namespace integration_framework
diff --git a/test/regression/regression_test.cpp b/test/regression/regression_test.cpp
@@ -80,3 +80,13 @@ TEST(RegressionTest, DoubleCallOfDone) {
   itf.setInitialState(kAdminKeypair).done();
   itf.done();
 }
+
+/**
+ * @given non initialized ITF instance
+ * @when done method is called inside destructor
+ * @then no exceptions are risen
+ */
+TEST(RegressionTest, DestructionOfNonInitializedItf) {
+  integration_framework::IntegrationTestFramework itf(
+      1, [](auto &itf) { itf.done(); });
+}