summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2004-10-28 22:31:11 +0000
committerTom Lane2004-10-28 22:31:11 +0000
commitfe2bfa6332519ba45719f3b313cac4ecb6d43c2e (patch)
treecb7314d740c365a48a50dfea535ae76e6452beec
parent5a5f34e0220c6eb74a0afbad95fde682a009484d (diff)
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
-rw-r--r--contrib/dblink/dblink.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index f6c95ef1dcd..1841284917a 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)
{