database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-22 02:52:08 +03:00
Code Activity

Fix use-after-free introduced in 55ed3defc9

Browse Source 
Evidenced by failure under RELCACHE_FORCE_RELEASE (buildfarm member
prion).

Author: Amit Langote
Discussion: https://postgr.es/m/CA+HiwqGV=k_Eh4jBiQw66ivvdG+EUkrEYeHTYL1SvDj_YOYV0g@mail.gmail.com
This commit is contained in:
Alvaro Herrera
2019-06-27 11:57:10 -04:00
parent f2f0082ef5
commit 050098b14e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/commands/indexcmds.c
View File

@ -1059,13 +1059,11 @@ DefineIndex(Oid relationId,
memcpy(part_oids, partdesc->oids, sizeof(Oid) * nparts); memcpy(part_oids, partdesc->oids, sizeof(Oid) * nparts);
parentDesc = CreateTupleDescCopy(RelationGetDescr(rel)); parentDesc = RelationGetDescr(rel);
opfamOids = palloc(sizeof(Oid) * numberOfKeyAttributes); opfamOids = palloc(sizeof(Oid) * numberOfKeyAttributes);
for (i = 0; i < numberOfKeyAttributes; i++) for (i = 0; i < numberOfKeyAttributes; i++)
opfamOids[i] = get_opclass_family(classObjectId[i]); opfamOids[i] = get_opclass_family(classObjectId[i]);
table_close(rel, NoLock);
/* /*
* For each partition, scan all existing indexes; if one matches * For each partition, scan all existing indexes; if one matches
* our index definition and is not already attached to some other * our index definition and is not already attached to some other
@ -1265,13 +1263,12 @@ DefineIndex(Oid relationId,
heap_freetuple(newtup); heap_freetuple(newtup);
} }
} }
else
table_close(rel, NoLock);
/* /*
* Indexes on partitioned tables are not themselves built, so we're * Indexes on partitioned tables are not themselves built, so we're
* done here. * done here.
*/ */
table_close(rel, NoLock);
if (!OidIsValid(parentIndexId)) if (!OidIsValid(parentIndexId))
pgstat_progress_end_command(); pgstat_progress_end_command();
return address; return address;