From: Timo Sirainen <tss@iki.fi>
Date: Wed, 10 Jun 2015 13:08:28 +0000 (+0300)
Subject: cassandra: Don't crash on failed queries.
X-Git-Tag: 2.2.19.rc1~361
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0e811f0e306bb20d3da9c26353bdd5669132f29;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Don't crash on failed queries.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 7d426539d3..6e1c3778c3 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -437,8 +437,10 @@ static void driver_cassandra_result_free(struct sql_result *_result)
 	db->cur_result = NULL;
 
 	driver_cassandra_set_idle(db);
-	cass_result_free(result->result);
-	cass_iterator_free(result->iterator);
+	if (result->result != NULL)
+		cass_result_free(result->result);
+	if (result->iterator != NULL)
+		cass_iterator_free(result->iterator);
 	cass_statement_free(result->statement);
 	pool_unref(&result->row_pool);
 	i_free(result->query);