From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 28 Oct 2004 22:31:11 +0000 (+0000)
Subject: This makes dblink pass its installcheck test on platforms where
X-Git-Tag: REL8_0_0BETA5~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe2bfa6332519ba45719f3b313cac4ecb6d43c2e;p=postgresql

This makes dblink pass its installcheck test on platforms where
snprintf(data, len, %s, NULL) crash.

The code was trying to find a connection by name when it already had an
unnamed connection and did not have a name to search with.

Kris Jurka
---

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index f6c95ef1dc..1841284917 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -310,10 +310,10 @@ dblink_open(PG_FUNCTION_ARGS)
 			conname = GET_STR(PG_GETARG_TEXT_P(0));
 			curname = GET_STR(PG_GETARG_TEXT_P(1));
 			sql = GET_STR(PG_GETARG_TEXT_P(2));
+			rcon = getConnectionByName(conname);
+			if (rcon)
+				conn = rcon->con;
 		}
-		rcon = getConnectionByName(conname);
-		if (rcon)
-			conn = rcon->con;
 	}
 	else if (PG_NARGS() == 4)
 	{