NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd74ecbc

committed

Protect against NULL-dereference in pg_dump

findTableByOid() is allowed to return NULL and we should therefore bechecking for that case. getOwnedSeqs() and dumpSequence() shouldn'tever actually see this happen, but given odd circumstances it might andcommitf9e439b probably shouldn't have removed that check.Pointed out by Coverity. Initial patch from Michael Paquier.Back-patch to 9.6, where that commit had removed the check.

1 parentc52d37c commitd74ecbcCopy full SHA for d74ecbc

File tree

1 file changed

-1

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-1

lines changed

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

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5643,6 +5643,9 @@ getOwnedSeqs(Archive *fout, TableInfo tblinfo[], int numTables)`
`5643`	`5643`	`continue;/* not an owned sequence */`
`5644`	`5644`
`5645`	`5645`	`owning_tab = findTableByOid(seqinfo->owning_tab);`
	`5646`	`+if (owning_tab == NULL)`
	`5647`	`+exit_horribly(NULL, "failed sanity check, parent table OID %u of sequence OID %u not found\n",`
	`5648`	`+ seqinfo->owning_tab, seqinfo->dobj.catId.oid);`
`5646`	`5649`
`5647`	`5650`	`/*`
`5648`	`5651`	`* We need to dump the components that are being dumped for the table`
`@@ -15583,7 +15586,11 @@ dumpSequence(Archive fout, TableInfo tbinfo)`
`15583`	`15586`	`{`
`15584`	`15587`	`TableInfo *owning_tab = findTableByOid(tbinfo->owning_tab);`
`15585`	`15588`
`15586`		`-if (owning_tab && owning_tab->dobj.dump & DUMP_COMPONENT_DEFINITION)`
	`15589`	`+if (owning_tab == NULL)`
	`15590`	`+exit_horribly(NULL, "failed sanity check, parent table OID %u of sequence OID %u not found\n",`
	`15591`	`+ tbinfo->owning_tab, tbinfo->dobj.catId.oid);`
	`15592`	`+`
	`15593`	`+if (owning_tab->dobj.dump & DUMP_COMPONENT_DEFINITION)`
`15587`	`15594`	`{`
`15588`	`15595`	`resetPQExpBuffer(query);`
`15589`	`15596`	`appendPQExpBuffer(query, "ALTER SEQUENCE %s",`

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!

Commitd74ecbc

File tree

1 file changed

1 file changed

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

0 commit comments