Fix copy-paste mistake in PQcancelCreate

alvherre · alvherre · commit 3497c87b05a6 · 2024-07-01T13:58:22.000+02:00
When an OOM occurred, this function was incorrectly setting a status of CONNECTION_BAD on the passed in PGconn instead of on the newly created PGcancelConn. Mistake introduced with 61461a3. Backpatch to 17. Author: Jelte Fennema-Nio <postgres@jeltef.nl> Reported-by: Noah Misch <noah@leadboat.com> Discussion: https://postgr.es/m/20240630190040.26.nmisch@google.com
diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c
@@ -155,7 +155,7 @@ PQcancelCreate(PGconn *conn)
 	return (PGcancelConn *) cancelConn;
 
 oom_error:
-	conn->status = CONNECTION_BAD;
+	cancelConn->status = CONNECTION_BAD;
 	libpq_append_conn_error(cancelConn, "out of memory");
 	return (PGcancelConn *) cancelConn;
 }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ PQcancelCreate(PGconn *conn)`
`155`	`155`	`return (PGcancelConn *) cancelConn;`
`156`	`156`
`157`	`157`	`oom_error:`
`158`		`- conn->status = CONNECTION_BAD;`
	`158`	`+ cancelConn->status = CONNECTION_BAD;`
`159`	`159`	`libpq_append_conn_error(cancelConn, "out of memory");`
`160`	`160`	`return (PGcancelConn *) cancelConn;`
`161`	`161`	`}`