Mercurial > dovecot > core-2.2
changeset 18648:d71fa3ae930f
lib-sql: Don't crash in Cassandra if connection to it failed.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 12 May 2015 18:16:54 +0300 |
parents | d09d2ea2c31a |
children | ac259cd62fbc |
files | src/lib-sql/driver-cassandra.c |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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); }