NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit713cfaf

committed

Silence Coverity complaint about possible null-pointer dereference.

If pg_init_privs were to contain a NULL ACL field, this code wouldpass old_acl == NULL to merge_acl_with_grant, which would crash.The case shouldn't happen, but it just takes a couple more linesof code to guard against it, so do so.Oversight in5342874; no back-patch needed.

1 parentc34d7df commit713cfafCopy full SHA for 713cfaf

File tree

1 file changed

+11

-8

lines changed

src/backend/catalog
- aclchk.c

1 file changed

+11

-8

lines changed

`‎src/backend/catalog/aclchk.c`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4934,14 +4934,17 @@ RemoveRoleFromInitPriv(Oid roleid, Oid classid, Oid objid, int32 objsubid)`
`4934`	`4934`	`/*`
`4935`	`4935`	`* Generate new ACL. Grantor of rights is always the same as the owner.`
`4936`	`4936`	`*/`
`4937`		`-new_acl=merge_acl_with_grant(old_acl,`
`4938`		`- false,/* is_grant */`
`4939`		`- false,/* grant_option */`
`4940`		`-DROP_RESTRICT,`
`4941`		`-list_make1_oid(roleid),`
`4942`		`-ACLITEM_ALL_PRIV_BITS,`
`4943`		`-ownerId,`
`4944`		`-ownerId);`
	`4937`	`+if (old_acl!=NULL)`
	`4938`	`+new_acl=merge_acl_with_grant(old_acl,`
	`4939`	`+ false,/* is_grant */`
	`4940`	`+ false,/* grant_option */`
	`4941`	`+DROP_RESTRICT,`
	`4942`	`+list_make1_oid(roleid),`
	`4943`	`+ACLITEM_ALL_PRIV_BITS,`
	`4944`	`+ownerId,`
	`4945`	`+ownerId);`
	`4946`	`+else`
	`4947`	`+new_acl=NULL;/* this case shouldn't happen, probably */`
`4945`	`4948`
`4946`	`4949`	`/* If we end with an empty ACL, delete the pg_init_privs entry. */`
`4947`	`4950`	`if (new_acl==NULL\|\|ACL_NUM(new_acl)==0)`

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!

Commit713cfaf

File tree

1 file changed

1 file changed

`‎src/backend/catalog/aclchk.c`

0 commit comments