Commit17bcdd0

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 parent8d65ea2 commit17bcdd0Copy full SHA for 17bcdd0

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

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

Comments

(0)