NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7f42350

committed

Avoid null pointer dereference if error result lacks SQLSTATE.

Although error results received from the backend should always havea SQLSTATE field, ones generated by libpq won't, making this codevulnerable to a crash after, say, untimely loss of connection.Noted by Coverity.Oversight in commit403a3d9. Back-patch to 9.5, as that was.

1 parentb17ff07 commit7f42350Copy full SHA for 7f42350

File tree

1 file changed

-6

lines changed

src/bin/pg_dump
- pg_backup_db.c

1 file changed

-6

lines changed

`‎src/bin/pg_dump/pg_backup_db.c`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -540,9 +540,9 @@ bool`
`540`	`540`	`IsLockTableGeneric(Archive*AHX)`
`541`	`541`	`{`
`542`	`542`	`ArchiveHandleAH= (ArchiveHandle)AHX;`
`543`		`-PGresult*res;`
`544`		`-char*sqlstate;`
`545`		`-boolretval;`
	`543`	`+PGresult*res;`
	`544`	`+char*sqlstate;`
	`545`	`+boolretval;`
`546`	`546`
`547`	`547`	`if (AHX->remoteVersion >=140000)`
`548`	`548`	`return true;`
`@@ -569,13 +569,15 @@ IsLockTableGeneric(Archive *AHX)`
`569`	`569`	`break;`
`570`	`570`	`casePGRES_FATAL_ERROR:`
`571`	`571`	`sqlstate=PQresultErrorField(res,PG_DIAG_SQLSTATE);`
`572`		`-if (strcmp(sqlstate,ERRCODE_WRONG_OBJECT_TYPE)==0)`
	`572`	`+if (sqlstate&&`
	`573`	`+strcmp(sqlstate,ERRCODE_WRONG_OBJECT_TYPE)==0)`
`573`	`574`	`{`
`574`	`575`	`retval= false;`
`575`	`576`	`break;`
`576`	`577`	`}`
`577`		`-elseif (strcmp(sqlstate,ERRCODE_LOCK_NOT_AVAILABLE)==0\|\|`
`578`		`-strcmp(sqlstate,ERRCODE_INSUFFICIENT_PRIVILEGE)==0)`
	`578`	`+elseif (sqlstate&&`
	`579`	`+ (strcmp(sqlstate,ERRCODE_LOCK_NOT_AVAILABLE)==0\|\|`
	`580`	`+strcmp(sqlstate,ERRCODE_INSUFFICIENT_PRIVILEGE)==0))`
`579`	`581`	`{`
`580`	`582`	`retval= true;`
`581`	`583`	`break;`

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!

Commit7f42350

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_backup_db.c`

0 commit comments