Commit9484982

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 parentc41f036 commit9484982Copy full SHA for 9484982

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`324`	`324`
`325`	`325`	`if (dbname!=NULL)`
`326`	`326`	`{`
`327`		`-/* get the detail informationout of dbname */`
	`327`	`+/* get the detail informationfrom dbname */`
`328`	`328`	`if (strncmp(dbname,"tcp:",4)==0\|\|strncmp(dbname,"unix:",5)==0)`
`329`	`329`	`{`
`330`	`330`	`intoffset=0;`
`@@ -343,7 +343,7 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`343`	`343`	`/*------`
`344`	`344`	`* new style:`
`345`	`345`	`*<tcp\|unix>:postgresql://server[:port\|:/unixsocket/path:]`
`346`		`- *[/dbname][?options]`
	`346`	`+ *[/db-name][?options]`
`347`	`347`	`*------`
`348`	`348`	`*/`
`349`	`349`	`offset+=strlen("postgresql://");`
`@@ -418,8 +418,10 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`418`	`418`	`}`
`419`	`419`	`}`
`420`	`420`	`else`
`421`		`-host=ecpg_strdup(dbname+offset,lineno);`
`422`		`-`
	`421`	`+{`
	`422`	`+if (*(dbname+offset)!='\0')`
	`423`	`+host=ecpg_strdup(dbname+offset,lineno);`
	`424`	`+}`
`423`	`425`	`}`
`424`	`426`	`}`
`425`	`427`	`else`

Comments

(0)