summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2004-10-29 17:53:13 +0000
committerBruce Momjian2004-10-29 17:53:13 +0000
commit08510856a4b05b5d4bd609a8a9c362a81d3ed55a (patch)
treecfed94f726331b59bcd257942a6bfede965684fe
parent51967daa06da9ff6fbf8441e44a8dbfc8568f901 (diff)
Set errorMessage length in PQrequestCancel() in all places.
-rw-r--r--src/interfaces/libpq/fe-connect.c5
1 files changed, 4 insertions, 1 deletions
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;
}