NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1adbb34

committed

Fix minor bugs in commit30bf468 et al.

Coverity complained that the "else" added to fillPGconn() was unreachable,which it was. Remove the dead code. In passing, rearrange the tests so asnot to bother trying to fetch values for options that can't be assigned.Pre-9.3 did not have that issue, but it did have a "return" that should be"goto oom_error" to ensure that a suitable error message gets filled in.

1 parent22dfd11 commit1adbb34Copy full SHA for 1adbb34

File tree

1 file changed

-9

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-9

lines changed

`‎src/interfaces/libpq/fe-connect.c`

Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -684,16 +684,16 @@ fillPGconn(PGconn conn, PQconninfoOption connOptions)`
`684`	`684`
`685`	`685`	`for (option=PQconninfoOptions;option->keyword;option++)`
`686`	`686`	`{`
`687`		`-constchar*tmp=conninfo_getval(connOptions,option->keyword);`
`688`		`-`
`689`		`-if (tmp&&option->connofs >=0)`
	`687`	`+if (option->connofs >=0)`
`690`	`688`	`{`
`691`		`-charconnmember=(char) ((char*)conn+option->connofs);`
	`689`	`+constchar*tmp=conninfo_getval(connOptions,option->keyword);`
`692`	`690`
`693`		`-if (*connmember)`
`694`		`-free(*connmember);`
`695`	`691`	`if (tmp)`
`696`	`692`	`{`
	`693`	`+charconnmember= (char) ((char*)conn+option->connofs);`
	`694`	`+`
	`695`	`+if (*connmember)`
	`696`	`+free(*connmember);`
`697`	`697`	`*connmember=strdup(tmp);`
`698`	`698`	`if (*connmember==NULL)`
`699`	`699`	`{`
`@@ -702,8 +702,6 @@ fillPGconn(PGconn conn, PQconninfoOption connOptions)`
`702`	`702`	`return false;`
`703`	`703`	`}`
`704`	`704`	`}`
`705`		`-else`
`706`		`-*connmember=NULL;`
`707`	`705`	`}`
`708`	`706`	`}`
`709`	`707`
`@@ -793,7 +791,6 @@ connectOptions2(PGconn *conn)`
`793`	`791`	`conn->pgpass=strdup(DefaultPassword);`
`794`	`792`	`if (!conn->pgpass)`
`795`	`793`	`gotooom_error;`
`796`		`-`
`797`	`794`	`}`
`798`	`795`	`else`
`799`	`796`	`conn->dot_pgpass_used= true;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1adbb34

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-connect.c`

0 commit comments