Do not use an empty hostname.

When trying to connect to a given database libecpg should not try using an
empty hostname if no hostname was given.
REL8_4_STABLE
Michael Meskes 12 years ago
parent 302cbc5fa6
commit 96de4939c0
  1. 10
      src/interfaces/ecpg/ecpglib/connect.c

@ -326,7 +326,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
if (dbname != NULL) if (dbname != NULL)
{ {
/* get the detail information out of dbname */ /* get the detail information from dbname */
if (strncmp(dbname, "tcp:", 4) == 0 || strncmp(dbname, "unix:", 5) == 0) if (strncmp(dbname, "tcp:", 4) == 0 || strncmp(dbname, "unix:", 5) == 0)
{ {
int offset = 0; int offset = 0;
@ -345,7 +345,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
/*------ /*------
* new style: * new style:
* <tcp|unix>:postgresql://server[:port|:/unixsocket/path:] * <tcp|unix>:postgresql://server[:port|:/unixsocket/path:]
* [/db name][?options] * [/db-name][?options]
*------ *------
*/ */
offset += strlen("postgresql://"); offset += strlen("postgresql://");
@ -420,8 +420,10 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
} }
} }
else else
host = ecpg_strdup(dbname + offset, lineno); {
if (*(dbname + offset) != '\0')
host = ecpg_strdup(dbname + offset, lineno);
}
} }
} }
else else

Loading…
Cancel
Save