NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8285b48

committed

Fix potential NULL pointer dereference in getIdentitySequence()

The function invokes SearchSysCacheAttNum() and SearchSysCacheAttName().They may respectively return 0 for the attribute number or NULL forthe attribute name if the attribute does not exist, without any kind oferror handling. The common practice is to check that the data retrievedfrom the syscache is valid. There is no risk of NULL pointerdereferences currently, but let's stick to the practice of making surethat this data is always valid, to catch future inconsistency mistakes.The code is switched to use get_attnum() and get_attname(), and addssome error handling.Oversight in5091995.Reported-by: Ranier VilelaAuthor: Ashutosh BapatDiscussion:https://postgr.es/m/CAEudQAqh_RZqoFcYKso5d9VhF-Vd64_ZodfQ_2zSusszkEmyRg@mail.gmail.com

1 parent945ec4c commit8285b48Copy full SHA for 8285b48

File tree

1 file changed

-13

lines changed

src/backend/catalog
- pg_depend.c

1 file changed

-13

lines changed

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

Lines changed: 7 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ getOwnedSequences(Oid relid)`
`945`	`945`	`Oid`
`946`	`946`	`getIdentitySequence(Relationrel,AttrNumberattnum,boolmissing_ok)`
`947`	`947`	`{`
`948`		`-Oidrelid;`
	`948`	`+Oidrelid=RelationGetRelid(rel);`
`949`	`949`	`List*seqlist;`
`950`	`950`
`951`	`951`	`/*`
`@@ -954,22 +954,16 @@ getIdentitySequence(Relation rel, AttrNumber attnum, bool missing_ok)`
`954`	`954`	`*/`
`955`	`955`	`if (RelationGetForm(rel)->relispartition)`
`956`	`956`	`{`
`957`		`-List*ancestors=`
`958`		`-get_partition_ancestors(RelationGetRelid(rel));`
`959`		`-HeapTuplectup=SearchSysCacheAttNum(RelationGetRelid(rel),attnum);`
`960`		`-constchar*attname=NameStr(((Form_pg_attribute)GETSTRUCT(ctup))->attname);`
`961`		`-HeapTupleptup;`
	`957`	`+List*ancestors=get_partition_ancestors(relid);`
	`958`	`+constchar*attname=get_attname(relid,attnum, false);`
`962`	`959`
`963`	`960`	`relid=llast_oid(ancestors);`
`964`		`-ptup=SearchSysCacheAttName(relid,attname);`
`965`		`-attnum= ((Form_pg_attribute)GETSTRUCT(ptup))->attnum;`
`966`		`-`
`967`		`-ReleaseSysCache(ctup);`
`968`		`-ReleaseSysCache(ptup);`
	`961`	`+attnum=get_attnum(relid,attname);`
	`962`	`+if (attnum==InvalidAttrNumber)`
	`963`	`+elog(ERROR,"cache lookup failed for attribute \"%s\" of relation %u",`
	`964`	`+attname,relid);`
`969`	`965`	`list_free(ancestors);`
`970`	`966`	`}`
`971`		`-else`
`972`		`-relid=RelationGetRelid(rel);`
`973`	`967`
`974`	`968`	`seqlist=getOwnedSequences_internal(relid,attnum,DEPENDENCY_INTERNAL);`
`975`	`969`	`if (list_length(seqlist)>1)`

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!

Commit8285b48

File tree

1 file changed

1 file changed

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

0 commit comments