Commit7c957ec

Michael Meskes

committed

Do not use an empty hostname.

When trying to connect to a given database libecpg should not try using anempty hostname if no hostname was given.

1 parentc01bc51 commit7c957ecCopy full SHA for 7c957ec

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`325`	`325`
`326`	`326`	`if (dbname!=NULL)`
`327`	`327`	`{`
`328`		`-/* get the detail informationout of dbname */`
	`328`	`+/* get the detail informationfrom dbname */`
`329`	`329`	`if (strncmp(dbname,"tcp:",4)==0\|\|strncmp(dbname,"unix:",5)==0)`
`330`	`330`	`{`
`331`	`331`	`intoffset=0;`
`@@ -344,7 +344,7 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`344`	`344`	`/*------`
`345`	`345`	`* new style:`
`346`	`346`	`*<tcp\|unix>:postgresql://server[:port\|:/unixsocket/path:]`
`347`		`- *[/dbname][?options]`
	`347`	`+ *[/db-name][?options]`
`348`	`348`	`*------`
`349`	`349`	`*/`
`350`	`350`	`offset+=strlen("postgresql://");`
`@@ -427,8 +427,11 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`427`	`427`	`}`
`428`	`428`	`else`
`429`	`429`	`{`
`430`		`-host=ecpg_strdup(dbname+offset,lineno);`
`431`		`-connect_params++;`
	`430`	`+if (*(dbname+offset)!='\0')`
	`431`	`+{`
	`432`	`+host=ecpg_strdup(dbname+offset,lineno);`
	`433`	`+connect_params++;`
	`434`	`+}`
`432`	`435`	`}`
`433`	`436`
`434`	`437`	`}`

Comments

(0)