diff options
| author | Itagaki Takahiro <itagaki.takahiro@gmail.com> | 2010-06-09 00:59:54 +0000 |
|---|---|---|
| committer | Itagaki Takahiro <itagaki.takahiro@gmail.com> | 2010-06-09 00:59:54 +0000 |
| commit | 7bd31c67150191e0261c96d8870587e5b294e50f (patch) | |
| tree | 090e3e183f9f76f39f4df496827ed9862411836d | |
| parent | fe940c624f3c716ce155be176f49dd83313e2f30 (diff) | |
Fix connection leak in dblink when dblink_connect() or dblink_connect_u()
end with "duplicate connection name" errors.
Backported to release 7.4.
| -rw-r--r-- | contrib/dblink/dblink.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index bbe40060a2f..e5db663ec43 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.60.2.6 2010/06/03 09:43:04 itagaki Exp $ + * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.60.2.7 2010/06/09 00:59:54 itagaki Exp $ * Copyright (c) 2001-2006, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * @@ -2287,9 +2287,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; strncpy(hentry->name, name, NAMEDATALEN - 1); |