diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-06-11 19:17:50 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-06-11 19:17:50 -0400 |
| commit | b10edaf4bb4473adc897f5643ede8c9100abddce (patch) | |
| tree | 59bfe9148fb09e44d17c095789879babac614a93 | |
| parent | 858571843c8affff5a69527faa3e57f8adfa4165 (diff) | |
| download | postgresql-b10edaf4bb4473adc897f5643ede8c9100abddce.tar.gz postgresql-b10edaf4bb4473adc897f5643ede8c9100abddce.zip | |
Fix access to just-closed relcache entry.
It might be impossible for this to cause a problem in non-debug builds,
since there'd be no opportunity for the relcache entry to get recycled
before the fetch. It blows up nicely with -DRELCACHE_FORCE_RELEASE plus
valgrind, though.
Evidently introduced by careless refactoring in commit f0e44751d.
Back-patch accordingly.
Discussion: https://postgr.es/m/27543.1528758304@sss.pgh.pa.us
| -rw-r--r-- | src/backend/commands/tablecmds.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index cb7d8667103..215c2b47c8e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -11502,12 +11502,12 @@ ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode) /* Off to RemoveInheritance() where most of the work happens */ RemoveInheritance(rel, parent_rel); - /* keep our lock on the parent relation until commit */ - heap_close(parent_rel, NoLock); - ObjectAddressSet(address, RelationRelationId, RelationGetRelid(parent_rel)); + /* keep our lock on the parent relation until commit */ + heap_close(parent_rel, NoLock); + return address; } |