mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
PQexecFinish().  Per report from Andreas Pflug.
This commit is contained in:
Tom Lane 2003-12-28 17:29:41 +00:00
parent f8eed65dfb
commit 36c9a01acf
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/libpq/fe-exec.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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; return false;
} }
} }
/* check for loss of connection, too */
if (conn->status == CONNECTION_BAD)
return false;
} }
/* OK to send a command */ /* 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 * We have to stop if we see copy in/out, however. We will resume parsing
* after application performs the data transfer. * after application performs the data transfer.
*
* Also stop if the connection is lost (else we'll loop infinitely).
*/ */
lastResult = NULL; lastResult = NULL;
while ((result = PQgetResult(conn)) != NULL) while ((result = PQgetResult(conn)) != NULL)
@ -1281,7 +1286,8 @@ PQexecFinish(PGconn *conn)
} }
lastResult = result; lastResult = result;
if (result->resultStatus == PGRES_COPY_IN || if (result->resultStatus == PGRES_COPY_IN ||
result->resultStatus == PGRES_COPY_OUT) result->resultStatus == PGRES_COPY_OUT ||
conn->status == CONNECTION_BAD)
break; break;
} }