Set errorMessage length in PQrequestCancel() in all places.

bmomjian · bmomjian · commit 08510856a4b0 · 2004-10-29T17:53:13.000Z
diff --git 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 @@ PQrequestCancel(PGconn *conn)
 			goto retry3;
 		strcpy(conn->errorMessage.data,
 			   "PQrequestCancel() -- connect() failed: ");
+		conn->errorMessage.len = strlen(conn->errorMessage.data);
 		goto cancel_errReturn;
 	}
 
@@ -2285,6 +2287,7 @@ PQrequestCancel(PGconn *conn)
 			goto retry4;
 		strcpy(conn->errorMessage.data,
 			   "PQrequestCancel() -- send() failed: ");
+		conn->errorMessage.len = strlen(conn->errorMessage.data);
 		goto cancel_errReturn;
 	}
 

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-connect.c,v 1.286 2004/10/21 20:23:19 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.287 2004/10/29 17:53:13 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2252,6 +2252,7 @@ PQrequestCancel(PGconn *conn)`
`2252`	`2252`	`{`
`2253`	`2253`	`strcpy(conn->errorMessage.data,`
`2254`	`2254`	`"PQrequestCancel() -- socket() failed: ");`
	`2255`	`+ conn->errorMessage.len = strlen(conn->errorMessage.data);`
`2255`	`2256`	`goto cancel_errReturn;`
`2256`	`2257`	`}`
`2257`	`2258`	`retry3:`
`@@ -2263,6 +2264,7 @@ PQrequestCancel(PGconn *conn)`
`2263`	`2264`	`goto retry3;`
`2264`	`2265`	`strcpy(conn->errorMessage.data,`
`2265`	`2266`	`"PQrequestCancel() -- connect() failed: ");`
	`2267`	`+ conn->errorMessage.len = strlen(conn->errorMessage.data);`
`2266`	`2268`	`goto cancel_errReturn;`
`2267`	`2269`	`}`
`2268`	`2270`
`@@ -2285,6 +2287,7 @@ PQrequestCancel(PGconn *conn)`
`2285`	`2287`	`goto retry4;`
`2286`	`2288`	`strcpy(conn->errorMessage.data,`
`2287`	`2289`	`"PQrequestCancel() -- send() failed: ");`
	`2290`	`+ conn->errorMessage.len = strlen(conn->errorMessage.data);`
`2288`	`2291`	`goto cancel_errReturn;`
`2289`	`2292`	`}`
`2290`	`2293`