dovecot-2.2: lib-sql: Don't crash in Cassandra if connection to ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d71fa3ae930f
changeset: 18648:d71fa3ae930f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 12 18:16:54 2015 +0300
description:
lib-sql: Don't crash in Cassandra if connection to it failed.

diffstat:

 src/lib-sql/driver-cassandra.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r d09d2ea2c31a -r d71fa3ae930f src/lib-sql/driver-cassandra.c
--- a/src/lib-sql/driver-cassandra.c	Tue May 12 16:44:45 2015 +0300
+++ b/src/lib-sql/driver-cassandra.c	Tue May 12 18:16:54 2015 +0300
@@ -530,9 +530,11 @@
 {
 	if (db->orig_ioloop == NULL)
 		return;
-	io_loop_set_current(db->orig_ioloop);
-	db->io_pipe = io_loop_move_io(&db->io_pipe);
-	io_loop_set_current(db->ioloop);
+	if (db->io_pipe != NULL) {
+		io_loop_set_current(db->orig_ioloop);
+		db->io_pipe = io_loop_move_io(&db->io_pipe);
+		io_loop_set_current(db->ioloop);
+	}
 	io_loop_destroy(&db->ioloop);
 }