Restore ptmp_timeout for cases where no timeout is passed.

bmomjian · bmomjian · commit 6d9d97e8ab63 · 2002-10-14T17:33:08.000Z
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.81 2002/10/14 17:15:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.82 2002/10/14 17:33:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -790,6 +790,7 @@ pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval *timeo
 	fd_set		except_mask;
 
 	struct timeval tmp_timeout;
+	struct timeval *ptmp_timeout = NULL;
 
 	if (conn->sock < 0)
 	{
@@ -826,9 +827,10 @@ pqWaitTimed(int forRead, int forWrite, PGconn *conn, const struct timeval *timeo
 			 *	use copy
 			 */
 			tmp_timeout = *timeout;
+			ptmp_timeout = &tmp_timeout;
 		}
 		if (select(conn->sock + 1, &input_mask, &output_mask,
-				   &except_mask, &tmp_timeout) < 0)
+				   &except_mask, ptmp_timeout) < 0)
 		{
 			if (SOCK_ERRNO == EINTR)
 				goto retry5;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.81 2002/10/14 17:15:11 momjian Exp $`
	`28`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.82 2002/10/14 17:33:08 momjian Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -790,6 +790,7 @@ pqWaitTimed(int forRead, int forWrite, PGconn conn, const struct timeval timeo`
`790`	`790`	`fd_set except_mask;`
`791`	`791`
`792`	`792`	`struct timeval tmp_timeout;`
	`793`	`+ struct timeval *ptmp_timeout = NULL;`
`793`	`794`
`794`	`795`	`if (conn->sock < 0)`
`795`	`796`	`{`
`@@ -826,9 +827,10 @@ pqWaitTimed(int forRead, int forWrite, PGconn conn, const struct timeval timeo`
`826`	`827`	`* use copy`
`827`	`828`	`*/`
`828`	`829`	`tmp_timeout = *timeout;`
	`830`	`+ ptmp_timeout = &tmp_timeout;`
`829`	`831`	`}`
`830`	`832`	`if (select(conn->sock + 1, &input_mask, &output_mask,`
`831`		`- &except_mask, &tmp_timeout) < 0)`
	`833`	`+ &except_mask, ptmp_timeout) < 0)`
`832`	`834`	`{`
`833`	`835`	`if (SOCK_ERRNO == EINTR)`
`834`	`836`	`goto retry5;`