Fix memory leak in connection string validation.

jeff-davis · jeff-davis · commit 45da69371ebf · 2024-01-12T21:40:23.000-08:00
Introduced in commit c3afe8c. Discussion: https://postgr.es/m/066a65233d3cb4ea27a9e0778d2f1d0dc764b222.camel@j-davis.com Reviewed-by: Nathan Bossart, Tom Lane Backpatch-through: 16
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -284,10 +284,15 @@ libpqrcv_check_conninfo(const char *conninfo, bool must_use_password)
 		}
 
 		if (!uses_password)
+		{
+			/* malloc'd, so we must free it explicitly */
+			PQconninfoFree(opts);
+
 			ereport(ERROR,
 					(errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),
 					 errmsg("password is required"),
 					 errdetail("Non-superusers must provide a password in the connection string.")));
+		}
 	}
 
 	PQconninfoFree(opts);

Original file line number	Diff line number	Diff line change
`@@ -284,10 +284,15 @@ libpqrcv_check_conninfo(const char *conninfo, bool must_use_password)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`if (!uses_password)`
	`287`	`+ {`
	`288`	`+ /* malloc'd, so we must free it explicitly */`
	`289`	`+ PQconninfoFree(opts);`
	`290`	`+`
`287`	`291`	`ereport(ERROR,`
`288`	`292`	`(errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),`
`289`	`293`	`errmsg("password is required"),`
`290`	`294`	`errdetail("Non-superusers must provide a password in the connection string.")));`
	`295`	`+ }`
`291`	`296`	`}`
`292`	`297`
`293`	`298`	`PQconninfoFree(opts);`