From: Timo Sirainen <tss@iki.fi>
Date: Fri, 4 Mar 2011 17:51:06 +0000 (+0200)
Subject: pgsql: Don't assert-crash if query fails when trying to send it.
X-Git-Tag: 2.0.10~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=294c71436de227178c709e4d498e7be9b5d8d7fe;p=thirdparty%2Fdovecot%2Fcore.git

pgsql: Don't assert-crash if query fails when trying to send it.
---

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index f5e04931a5..205a0e3835 100644
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -450,6 +450,7 @@ static void do_query(struct pgsql_result *result, const char *query)
 	i_assert(db->cur_result == NULL);
 	i_assert(db->io == NULL);
 
+	driver_pgsql_set_state(db, SQL_DB_STATE_BUSY);
 	db->cur_result = result;
 	result->to = timeout_add(SQL_QUERY_TIMEOUT_SECS * 1000,
 				 query_timeout, result);
@@ -461,7 +462,6 @@ static void do_query(struct pgsql_result *result, const char *query)
 		return;
 	}
 
-	driver_pgsql_set_state(db, SQL_DB_STATE_BUSY);
 	if (ret > 0) {
 		/* write blocks */
 		db->io = io_add(PQsocket(db->pg), IO_WRITE,