Fix minor bugs in commit 30bf468 et al.

tglsfdc · tglsfdc · commit 1adbb347ec6c · 2014-11-30T12:20:44.000-05:00
Coverity complained that the "else" added to fillPGconn() was unreachable,
which it was.  Remove the dead code.  In passing, rearrange the tests so as
not 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.
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -684,16 +684,16 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
 
 	for (option = PQconninfoOptions; option->keyword; option++)
 	{
-		const char *tmp = conninfo_getval(connOptions, option->keyword);
-
-		if (tmp && option->connofs >= 0)
+		if (option->connofs >= 0)
 		{
-			char	  **connmember = (char **) ((char *) conn + option->connofs);
+			const char *tmp = conninfo_getval(connOptions, option->keyword);
 
-			if (*connmember)
-				free(*connmember);
 			if (tmp)
 			{
+				char	  **connmember = (char **) ((char *) conn + option->connofs);
+
+				if (*connmember)
+					free(*connmember);
 				*connmember = strdup(tmp);
 				if (*connmember == NULL)
 				{
@@ -702,8 +702,6 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
 					return false;
 				}
 			}
-			else
-				*connmember = NULL;
 		}
 	}
 
@@ -793,7 +791,6 @@ connectOptions2(PGconn *conn)
 			conn->pgpass = strdup(DefaultPassword);
 			if (!conn->pgpass)
 				goto oom_error;
-
 		}
 		else
 			conn->dot_pgpass_used = true;

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`		`- const char *tmp = conninfo_getval(connOptions, option->keyword);`
`688`		`-`
`689`		`- if (tmp && option->connofs >= 0)`
	`687`	`+ if (option->connofs >= 0)`
`690`	`688`	`{`
`691`		`- char connmember = (char ) ((char *) conn + option->connofs);`
	`689`	`+ const char *tmp = conninfo_getval(connOptions, option->keyword);`
`692`	`690`
`693`		`- if (*connmember)`
`694`		`- free(*connmember);`
`695`	`691`	`if (tmp)`
`696`	`692`	`{`
	`693`	`+ char connmember = (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`	`goto oom_error;`
`796`		`-`
`797`	`794`	`}`
`798`	`795`	`else`
`799`	`796`	`conn->dot_pgpass_used = true;`