diff options
| author | Itagaki Takahiro <itagaki.takahiro@gmail.com> | 2010-06-09 00:59:35 +0000 |
|---|---|---|
| committer | Itagaki Takahiro <itagaki.takahiro@gmail.com> | 2010-06-09 00:59:35 +0000 |
| commit | f7cb215362e9ddd2f083a404f945c343e288f4f5 (patch) | |
| tree | a1360fc928bb0354c844d0d98cd5eadefd320fcd | |
| parent | b5b5814515bd371a27b95755fc412a5ef7436e94 (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 5f5e652cfcc..6d4598fea17 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.69.2.4 2010/06/03 09:41:26 itagaki Exp $ + * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.69.2.5 2010/06/09 00:59:35 itagaki Exp $ * Copyright (c) 2001-2008, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * @@ -2301,9 +2301,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)); |