From: Timo Sirainen <tss@iki.fi>
Date: Wed, 16 Sep 2015 22:20:32 +0000 (+0900)
Subject: cassandra: Don't crash if connection to Cassandra failed.
X-Git-Tag: 2.2.19.rc1~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e8842470a4a17017529d43b39c40a7549c2ecf2;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Don't crash if connection to Cassandra failed.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 5c9211ba3e..9a4d5d020e 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -468,8 +468,10 @@ static void driver_cassandra_result_free(struct sql_result *_result)
 		cass_result_free(result->result);
 	if (result->iterator != NULL)
 		cass_iterator_free(result->iterator);
-	cass_statement_free(result->statement);
-	pool_unref(&result->row_pool);
+	if (result->statement != NULL)
+		cass_statement_free(result->statement);
+	if (result->row_pool != NULL)
+		pool_unref(&result->row_pool);
 	i_free(result->query);
 	i_free(result->error);
 	i_free(result);