Reset conn->errorReported when PQrequestCancel sets errorMessage.

tglsfdc · tglsfdc · commit 83a7637e2c5b · 2022-02-20T15:02:41.000-05:00
Oversight in commit 618c167. This is mainly neatnik-ism, since if PQrequestCancel is used per its API contract, we should perform pqClearConnErrorState before reaching any place that would consult errorReported. But still, it seems like a bad idea to potentially leave errorReported pointing past errorMessage.len.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4687,6 +4687,7 @@ PQrequestCancel(PGconn *conn)
 				"PQrequestCancel() -- connection is not open\n",
 				conn->errorMessage.maxlen);
 		conn->errorMessage.len = strlen(conn->errorMessage.data);
+		conn->errorReported = 0;
 
 		return false;
 	}
@@ -4706,7 +4707,10 @@ PQrequestCancel(PGconn *conn)
 	}
 
 	if (!r)
+	{
 		conn->errorMessage.len = strlen(conn->errorMessage.data);
+		conn->errorReported = 0;
+	}
 
 	return r;
 }

Original file line number	Diff line number	Diff line change
`@@ -4687,6 +4687,7 @@ PQrequestCancel(PGconn *conn)`
`4687`	`4687`	`"PQrequestCancel() -- connection is not open\n",`
`4688`	`4688`	`conn->errorMessage.maxlen);`
`4689`	`4689`	`conn->errorMessage.len = strlen(conn->errorMessage.data);`
	`4690`	`+ conn->errorReported = 0;`
`4690`	`4691`
`4691`	`4692`	`return false;`
`4692`	`4693`	`}`
`@@ -4706,7 +4707,10 @@ PQrequestCancel(PGconn *conn)`
`4706`	`4707`	`}`
`4707`	`4708`
`4708`	`4709`	`if (!r)`
	`4710`	`+ {`
`4709`	`4711`	`conn->errorMessage.len = strlen(conn->errorMessage.data);`
	`4712`	`+ conn->errorReported = 0;`
	`4713`	`+ }`
`4710`	`4714`
`4711`	`4715`	`return r;`
`4712`	`4716`	`}`