Fix allocation check to test the right variable

danielgustafsson · danielgustafsson · commit 917c00d761fa · 2025-06-17T22:42:38.000+02:00
The memory allocation for cancelConn->be_cancel_key was accidentally checking the be_cancel_key member in the conn object instead of the one in cancelConn. Author: Ranier Vilela <ranier.vf@gmail.com> Reviewed-by: Daniel Gustafsson <daniel@yesql.se> Discussion: https://postgr.es/m/CAEudQAq4ySDR6dsg9xwurBXwud02hX7XCOZZAcZx-JMn6A06nA@mail.gmail.com
diff --git a/src/interfaces/libpq/fe-cancel.c b/src/interfaces/libpq/fe-cancel.c
@@ -114,7 +114,7 @@ PQcancelCreate(PGconn *conn)
 	if (conn->be_cancel_key != NULL)
 	{
 		cancelConn->be_cancel_key = malloc(conn->be_cancel_key_len);
-		if (!conn->be_cancel_key)
+		if (cancelConn->be_cancel_key == NULL)
 			goto oom_error;
 		memcpy(cancelConn->be_cancel_key, conn->be_cancel_key, conn->be_cancel_key_len);
 	}

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ PQcancelCreate(PGconn *conn)`
`114`	`114`	`if (conn->be_cancel_key != NULL)`
`115`	`115`	`{`
`116`	`116`	`cancelConn->be_cancel_key = malloc(conn->be_cancel_key_len);`
`117`		`- if (!conn->be_cancel_key)`
	`117`	`+ if (cancelConn->be_cancel_key == NULL)`
`118`	`118`	`goto oom_error;`
`119`	`119`	`memcpy(cancelConn->be_cancel_key, conn->be_cancel_key, conn->be_cancel_key_len);`
`120`	`120`	`}`