plug dblink resource leak

jconway · jconway · commit d6119d8091b1 · 2009-09-12T23:20:52.000Z
dblink generates orphaned connections when called with a connection string,
fail_on_error = true, and an ERROR occurs. Discovery and patch by
Tatsuhito Kasahara. Introduced in 8.4.
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -8,7 +8,7 @@
  * Darko Prenosil <Darko.Prenosil@finteh.hr>
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.83 2009/08/05 16:11:07 joe Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.84 2009/09/12 23:20:52 joe Exp $
  * Copyright (c) 2001-2009, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -855,9 +855,9 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 			(PQresultStatus(res) != PGRES_COMMAND_OK &&
 			 PQresultStatus(res) != PGRES_TUPLES_OK))
 		{
-			dblink_res_error(conname, res, "could not execute query", fail);
 			if (freeconn)
 				PQfinish(conn);
+			dblink_res_error(conname, res, "could not execute query", fail);
 			MemoryContextSwitchTo(oldcontext);
 			SRF_RETURN_DONE(funcctx);
 		}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Darko Prenosil <Darko.Prenosil@finteh.hr>`
`9`	`9`	`* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.83 2009/08/05 16:11:07 joe Exp $`
	`11`	`+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.84 2009/09/12 23:20:52 joe Exp $`
`12`	`12`	`* Copyright (c) 2001-2009, PostgreSQL Global Development Group`
`13`	`13`	`* ALL RIGHTS RESERVED;`
`14`	`14`	`*`
`@@ -855,9 +855,9 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)`
`855`	`855`	`(PQresultStatus(res) != PGRES_COMMAND_OK &&`
`856`	`856`	`PQresultStatus(res) != PGRES_TUPLES_OK))`
`857`	`857`	`{`
`858`		`- dblink_res_error(conname, res, "could not execute query", fail);`
`859`	`858`	`if (freeconn)`
`860`	`859`	`PQfinish(conn);`
	`860`	`+ dblink_res_error(conname, res, "could not execute query", fail);`
`861`	`861`	`MemoryContextSwitchTo(oldcontext);`
`862`	`862`	`SRF_RETURN_DONE(funcctx);`
`863`	`863`	`}`