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 f6c95ef1dcdedc2eb7e871b12fffc0c87d86adfa..1841284917abbdee9ea47fb7ae10a6a8c62b24cc 100644 (file)
--- 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)
        {