Improve libpq's error recovery for connection loss during COPY.

In pqSendSome, if the connection is already closed at entry, discard any
queued output data before returning.  There is no possibility of ever
sending the data, and anyway this corresponds to what we'd do if we'd
detected a hard error while trying to send().  This avoids possible
indefinite bloat of the output buffer if the application keeps trying
to send data (or even just keeps trying to do PQputCopyEnd, as psql
indeed will).

Because PQputCopyEnd won't transition out of PGASYNC_COPY_IN state
until it's successfully queued the COPY END message, and pqPutMsgEnd
doesn't distinguish a queuing failure from a pqSendSome failure,
this omission allowed an infinite loop in psql if the connection closure
occurred when we had at least 8K queued to send.  It might be worth
refactoring so that we can make that distinction, but for the moment
the other changes made here seem to offer adequate defenses.

To guard against other variants of this scenario, do not allow
PQgetResult to return a PGRES_COPY_XXX result if the connection is
already known dead.  Make sure it returns PGRES_FATAL_ERROR instead.

Per report from Stephen Frost.  Back-patch to all active branches.

diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 605d242809298489dcee86700652d318ba027fa7..fdeee90dd3286523ac6c72c6a29138a514261570 100644 (file)
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -61,6 +61,7 @@ static int PQsendQueryGuts(PGconn *conn,
                                const int *paramFormats,
                                int resultFormat);
 static void parseInput(PGconn *conn);
+static PGresult *getCopyResult(PGconn *conn, ExecStatusType copytype);
 static bool PQexecStart(PGconn *conn);
 static PGresult *PQexecFinish(PGconn *conn);
 static int PQsendDescribe(PGconn *conn, char desc_type,
@@ -1563,22 +1564,13 @@ PQgetResult(PGconn *conn)
                        conn->asyncStatus = PGASYNC_BUSY;
                        break;
                case PGASYNC_COPY_IN:
-                       if (conn->result && conn->result->resultStatus == PGRES_COPY_IN)
-                               res = pqPrepareAsyncResult(conn);
-                       else
-                               res = PQmakeEmptyPGresult(conn, PGRES_COPY_IN);
+                       res = getCopyResult(conn, PGRES_COPY_IN);
                        break;
                case PGASYNC_COPY_OUT:
-                       if (conn->result && conn->result->resultStatus == PGRES_COPY_OUT)
-                               res = pqPrepareAsyncResult(conn);
-                       else
-                               res = PQmakeEmptyPGresult(conn, PGRES_COPY_OUT);
+                       res = getCopyResult(conn, PGRES_COPY_OUT);
                        break;
                case PGASYNC_COPY_BOTH:
-                       if (conn->result && conn->result->resultStatus == PGRES_COPY_BOTH)
-                               res = pqPrepareAsyncResult(conn);
-                       else
-                               res = PQmakeEmptyPGresult(conn, PGRES_COPY_BOTH);
+                       res = getCopyResult(conn, PGRES_COPY_BOTH);
                        break;
                default:
                        printfPQExpBuffer(&conn->errorMessage,
@@ -1615,6 +1607,36 @@ PQgetResult(PGconn *conn)
        return res;
 }
 
+/*
+ * getCopyResult
+ *       Helper for PQgetResult: generate result for COPY-in-progress cases
+ */
+static PGresult *
+getCopyResult(PGconn *conn, ExecStatusType copytype)
+{
+       /*
+        * If the server connection has been lost, don't pretend everything is
+        * hunky-dory; instead return a PGRES_FATAL_ERROR result, and reset the
+        * asyncStatus to idle (corresponding to what we'd do if we'd detected I/O
+        * error in the earlier steps in PQgetResult).  The text returned in the
+        * result is whatever is in conn->errorMessage; we hope that was filled
+        * with something relevant when the lost connection was detected.
+        */
+       if (conn->status != CONNECTION_OK)
+       {
+               pqSaveErrorResult(conn);
+               conn->asyncStatus = PGASYNC_IDLE;
+               return pqPrepareAsyncResult(conn);
+       }
+
+       /* If we have an async result for the COPY, return that */
+       if (conn->result && conn->result->resultStatus == copytype)
+               return pqPrepareAsyncResult(conn);
+
+       /* Otherwise, invent a suitable PGresult */
+       return PQmakeEmptyPGresult(conn, copytype);
+}
+
 
 /*
  * PQexec

diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index edf7682e192e99ea6a56d61e8d46af2bcdc0d95e..3a3a1cee2cbe0bfb092191ebbaf69f1a819f58fb 100644 (file)
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -782,6 +782,8 @@ pqSendSome(PGconn *conn, int len)
        {
                printfPQExpBuffer(&conn->errorMessage,
                                                  libpq_gettext("connection not open\n"));
+               /* Discard queued data; no chance it'll ever be sent */
+               conn->outCount = 0;
                return -1;
        }