NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit8ac0365

committed

Avoid improbable null pointer dereference in pgpassfileWarning().

Coverity complained that we might pass a null pointer to strcmp()if PQresultErrorField were to return NULL. That shouldn't be possible,since the server is supposed to always provide some SQLSTATE or otherin an error message. But we usually defend against such hazards, andit only takes a little more code to do so here.There's no good reason to think this is a live bug, so no back-patch.

1 parent555494d commit8ac0365Copy full SHA for 8ac0365

File tree

1 file changed

-8

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-8

lines changed

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

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6312,22 +6312,23 @@ passwordFromFile(char hostname, char port, char *dbname,`
`6312`	`6312`
`6313`	`6313`
`6314`	`6314`	`/*`
`6315`		`- *If the connection failed, we should mention if`
`6316`		`- *we got the password from the pgpassfile in case that`
`6317`		`- *password is wrong.`
	`6315`	`+ *If the connection failed due to bad password, we should mention`
	`6316`	`+ *if we got the password from the pgpassfile.`
`6318`	`6317`	`*/`
`6319`	`6318`	`staticvoid`
`6320`	`6319`	`pgpassfileWarning(PGconn*conn)`
`6321`	`6320`	`{`
`6322`	`6321`	`/* If it was 'invalid authorization', add pgpassfile mention */`
`6323`	`6322`	`/* only works with >= 9.0 servers */`
`6324`		`-if (conn->pgpassfile_used&&conn->password_needed&&conn->result&&`
`6325`		`-strcmp(PQresultErrorField(conn->result,PG_DIAG_SQLSTATE),`
`6326`		`-ERRCODE_INVALID_PASSWORD)==0)`
	`6323`	`+if (conn->pgpassfile_used&&conn->password_needed&&conn->result)`
`6327`	`6324`	`{`
`6328`		`-appendPQExpBuffer(&conn->errorMessage,`
	`6325`	`+constchar*sqlstate=PQresultErrorField(conn->result,`
	`6326`	`+PG_DIAG_SQLSTATE);`
	`6327`	`+`
	`6328`	`+if (sqlstate&&strcmp(sqlstate,ERRCODE_INVALID_PASSWORD)==0)`
	`6329`	`+appendPQExpBuffer(&conn->errorMessage,`
`6329`	`6330`	`libpq_gettext("password retrieved from file \"%s\"\n"),`
`6330`		`-conn->pgpassfile);`
	`6331`	`+conn->pgpassfile);`
`6331`	`6332`	`}`
`6332`	`6333`	`}`
`6333`	`6334`

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!

Commit8ac0365

File tree

1 file changed

1 file changed

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

0 commit comments