rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix use-after-free bug when renaming constraints 

This is an oversight from recent commit b13fd344.  While on it, tweak
the previous test with a better name for the renamed primary key.

Detected by buildfarm member prion which forces relation cache release
with -DRELCACHE_FORCE_RELEASE.  Back-patch down to 9.4 as the previous
commit.
This commit is contained in:
Michael Paquier 2018-12-17 12:43:00 +09:00
parent b13fd344c5
commit 67915fb8e5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/tablecmds.c
View File

@ -3020,12 +3020,12 @@ rename_constraint_internal(Oid myrelid,
if (targetrelation) if (targetrelation)
{ {
relation_close(targetrelation, NoLock); /* close rel but keep lock */
/* /*
* Invalidate relcache so as others can see the new constraint name. * Invalidate relcache so as others can see the new constraint name.
*/ */
CacheInvalidateRelcache(targetrelation); CacheInvalidateRelcache(targetrelation);
relation_close(targetrelation, NoLock); /* close rel but keep lock */
} }
return address; return address;

2
src/test/regress/expected/alter_table.out
View File

@ -400,7 +400,7 @@ CREATE TABLE constraint_rename_cache (a int,
ALTER TABLE constraint_rename_cache ALTER TABLE constraint_rename_cache
RENAME CONSTRAINT chk_a TO chk_a_new; RENAME CONSTRAINT chk_a TO chk_a_new;
ALTER TABLE constraint_rename_cache ALTER TABLE constraint_rename_cache
RENAME CONSTRAINT constraint_rename_cache_pkey TO chk_a_gt_zero; RENAME CONSTRAINT constraint_rename_cache_pkey TO constraint_rename_pkey_new;
CREATE TABLE like_constraint_rename_cache CREATE TABLE like_constraint_rename_cache
(LIKE constraint_rename_cache INCLUDING ALL); (LIKE constraint_rename_cache INCLUDING ALL);
\d like_constraint_rename_cache \d like_constraint_rename_cache

2
src/test/regress/sql/alter_table.sql
View File

@ -296,7 +296,7 @@ CREATE TABLE constraint_rename_cache (a int,
ALTER TABLE constraint_rename_cache ALTER TABLE constraint_rename_cache
RENAME CONSTRAINT chk_a TO chk_a_new; RENAME CONSTRAINT chk_a TO chk_a_new;
ALTER TABLE constraint_rename_cache ALTER TABLE constraint_rename_cache
RENAME CONSTRAINT constraint_rename_cache_pkey TO chk_a_gt_zero; RENAME CONSTRAINT constraint_rename_cache_pkey TO constraint_rename_pkey_new;
CREATE TABLE like_constraint_rename_cache CREATE TABLE like_constraint_rename_cache
(LIKE constraint_rename_cache INCLUDING ALL); (LIKE constraint_rename_cache INCLUDING ALL);
\d like_constraint_rename_cache \d like_constraint_rename_cache