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

tglsfdc · tglsfdc · commit 36c9a01acf00 · 2003-12-28T17:29:41.000Z
PQexecFinish().  Per report from Andreas Pflug.
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.155 2003/11/30 20:55:09 joe Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.156 2003/12/28 17:29:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1234,6 +1234,9 @@ PQexecStart(PGconn *conn)`
`1234`	`1234`	`return false;`
`1235`	`1235`	`}`
`1236`	`1236`	`}`
	`1237`	`+ /* check for loss of connection, too */`
	`1238`	`+ if (conn->status == CONNECTION_BAD)`
	`1239`	`+ return false;`
`1237`	`1240`	`}`
`1238`	`1241`
`1239`	`1242`	`/* OK to send a command */`
`@@ -1256,6 +1259,8 @@ PQexecFinish(PGconn *conn)`
`1256`	`1259`	`*`
`1257`	`1260`	`* We have to stop if we see copy in/out, however. We will resume parsing`
`1258`	`1261`	`* after application performs the data transfer.`
	`1262`	`+ *`
	`1263`	`+ * Also stop if the connection is lost (else we'll loop infinitely).`
`1259`	`1264`	`*/`
`1260`	`1265`	`lastResult = NULL;`
`1261`	`1266`	`while ((result = PQgetResult(conn)) != NULL)`
`@@ -1281,7 +1286,8 @@ PQexecFinish(PGconn *conn)`
`1281`	`1286`	`}`
`1282`	`1287`	`lastResult = result;`
`1283`	`1288`	`if (result->resultStatus == PGRES_COPY_IN \|\|`
`1284`		`- result->resultStatus == PGRES_COPY_OUT)`
	`1289`	`+ result->resultStatus == PGRES_COPY_OUT \|\|`
	`1290`	`+ conn->status == CONNECTION_BAD)`
`1285`	`1291`	`break;`
`1286`	`1292`	`}`
`1287`	`1293`