Avoid infinite loop if connection is lost during PQexecStart() or

PQexecFinish().  Per report from Andreas Pflug.

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 84b7d2e1c19f8bf98a67ada4d4fc4adf1266a672..eae1b764abbce2bd68e435ebb5113cdda1909195 100644 (file)
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.155 2003/11/30 20:55:09 joe Exp $
+ *   $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.156 2003/12/28 17:29:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1234,6 +1234,9 @@ PQexecStart(PGconn *conn)
                return false;
            }
        }
+       /* check for loss of connection, too */
+       if (conn->status == CONNECTION_BAD)
+           return false;
    }
 
    /* OK to send a command */
@@ -1256,6 +1259,8 @@ PQexecFinish(PGconn *conn)
     *
     * We have to stop if we see copy in/out, however. We will resume parsing
     * after application performs the data transfer.
+    *
+    * Also stop if the connection is lost (else we'll loop infinitely).
     */
    lastResult = NULL;
    while ((result = PQgetResult(conn)) != NULL)
@@ -1281,7 +1286,8 @@ PQexecFinish(PGconn *conn)
        }
        lastResult = result;
        if (result->resultStatus == PGRES_COPY_IN ||
-           result->resultStatus == PGRES_COPY_OUT)
+           result->resultStatus == PGRES_COPY_OUT ||
+           conn->status == CONNECTION_BAD)
            break;
    }