From: Itagaki Takahiro <itagaki.takahiro@gmail.com>
Date: Wed, 9 Jun 2010 00:56:25 +0000 (+0000)
Subject: Fix connection leak in dblink when dblink_connect() or dblink_connect_u()
X-Git-Tag: REL8_4_5~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=effcafeaa18b651c30f12077baae484efc6c6368;p=postgresql

Fix connection leak in dblink when dblink_connect() or dblink_connect_u()
end with "duplicate connection name" errors.

Backported to release 7.4.
---

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index cde6c32957..b9433fcaa4 100644
--- 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.82.2.3 2010/06/03 09:40:17 itagaki Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.82.2.4 2010/06/09 00:56:25 itagaki Exp $
  * Copyright (c) 2001-2009, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -2275,9 +2275,14 @@ createNewConnection(const char *name, remoteConn *rconn)
 											   HASH_ENTER, &found);
 
 	if (found)
+	{
+		PQfinish(rconn->conn);
+		pfree(rconn);
+
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("duplicate connection name")));
+	}
 
 	hentry->rconn = rconn;
 	strlcpy(hentry->name, name, sizeof(hentry->name));