pgsql: If query fails because connection gets closed, return a proper error message.

--HG--
branch : HEAD

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index e31b7979b21db10080fad1f8480ce20d55456740..ce5ab1ad4df2a5bc2b66dbb1cbfd68b3e123067e 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -776,16 +776,21 @@ static const char *driver_pgsql_result_get_error(struct sql_result *_result)
        const char *msg;
        size_t len;
 
-       msg = PQresultErrorMessage(result->pgres);
-       if (msg == NULL)
-               return "(no error set)";
+       i_free_and_null(db->error);
 
-       /* Error message should contain trailing \n, we don't want it */
-       len = strlen(msg);
-       i_free(db->error);
-       db->error = len == 0 || msg[len-1] != '\n' ?
-               i_strdup(msg) : i_strndup(msg, len-1);
+       if (result->pgres == NULL) {
+               /* connection error */
+               db->error = i_strdup(last_error(db));
+       } else {
+               msg = PQresultErrorMessage(result->pgres);
+               if (msg == NULL)
+                       return "(no error set)";
 
+               /* Error message should contain trailing \n, we don't want it */
+               len = strlen(msg);
+               db->error = len == 0 || msg[len-1] != '\n' ?
+                       i_strdup(msg) : i_strndup(msg, len-1);
+       }
        return db->error;
 }