dovecot-2.2: cassandra: Don't crash if connection to Cassandra f...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/7ddc7d2a3036
changeset: 19151:7ddc7d2a3036
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Sep 17 07:20:32 2015 +0900
description:
cassandra: Don't crash if connection to Cassandra failed.

diffstat:

 src/lib-sql/driver-cassandra.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r a72a65771d8c -r 7ddc7d2a3036 src/lib-sql/driver-cassandra.c
--- a/src/lib-sql/driver-cassandra.c	Thu Sep 17 07:07:57 2015 +0900
+++ b/src/lib-sql/driver-cassandra.c	Thu Sep 17 07:20:32 2015 +0900
@@ -468,8 +468,10 @@
 		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);