From: Michael Meskes <meskes@postgresql.org>
Date: Wed, 1 Jan 2014 11:24:19 +0000 (+0100)
Subject: Do not use an empty hostname.
X-Git-Tag: REL9_3_3~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8404037d89537a536f0db7e6c977378ed1017e9e;p=postgresql

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.
---

diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index 49f2d546bb..55c56807b2 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -325,7 +325,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 
 	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)
 		{
 			int			offset = 0;
@@ -344,7 +344,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 				/*------
 				 * new style:
 				 *	<tcp|unix>:postgresql://server[:port|:/unixsocket/path:]
-				 *	[/db name][?options]
+				 *	[/db-name][?options]
 				 *------
 				 */
 				offset += strlen("postgresql://");
@@ -427,8 +427,11 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 				}
 				else
 				{
-					host = ecpg_strdup(dbname + offset, lineno);
-					connect_params++;
+					if (*(dbname + offset) != '\0')
+					{
+						host = ecpg_strdup(dbname + offset, lineno);
+						connect_params++;
+					}
 				}
 
 			}