From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 29 Oct 2004 17:53:13 +0000 (+0000)
Subject: Set errorMessage length in PQrequestCancel() in all places.
X-Git-Tag: REL8_0_0BETA5~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08510856a4b05b5d4bd609a8a9c362a81d3ed55a;p=thirdparty%2Fpostgresql.git

Set errorMessage length in PQrequestCancel() in all places.
---

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 852247ce323..b4a9641a186 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.286 2004/10/21 20:23:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.287 2004/10/29 17:53:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2252,6 +2252,7 @@ PQrequestCancel(PGconn *conn)
 	{
 		strcpy(conn->errorMessage.data,
 			   "PQrequestCancel() -- socket() failed: ");
+		conn->errorMessage.len = strlen(conn->errorMessage.data);
 		goto cancel_errReturn;
 	}
 retry3:
@@ -2263,6 +2264,7 @@ retry3:
 			goto retry3;
 		strcpy(conn->errorMessage.data,
 			   "PQrequestCancel() -- connect() failed: ");
+		conn->errorMessage.len = strlen(conn->errorMessage.data);
 		goto cancel_errReturn;
 	}
 
@@ -2285,6 +2287,7 @@ retry4:
 			goto retry4;
 		strcpy(conn->errorMessage.data,
 			   "PQrequestCancel() -- send() failed: ");
+		conn->errorMessage.len = strlen(conn->errorMessage.data);
 		goto cancel_errReturn;
 	}