Skip to content

Commit cc623ed

Browse files
committed
Fix use-after-free bug with event triggers and ALTER TABLE.
EventTriggerAlterTableEnd neglected to make sure that it built its output list in the right context. In simple cases this was masked because the function is called in PortalContext which will be sufficiently long-lived anyway; but that doesn't make it not a bug. Commit ced138e fixed this in HEAD and v13, but mistakenly chose not to back-patch further. Back-patch the same code change all the way (I didn't bother with the test case though, as it would prove nothing in pre-v13 branches). Per report from Arseny Sher. Original fix by Jehan-Guillaume de Rorthais. Discussion: https://postgr.es/m/877drcyprb.fsf@ars-thinkpad Discussion: https://postgr.es/m/20200902193715.6e0269d4@firost
1 parent 00e4788 commit cc623ed

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/backend/commands/event_trigger.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,9 +1802,15 @@ EventTriggerAlterTableEnd(void)
18021802
/* If no subcommands, don't collect */
18031803
if (list_length(currentEventTriggerState->currentCommand->d.alterTable.subcmds) != 0)
18041804
{
1805+
MemoryContext oldcxt;
1806+
1807+
oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);
1808+
18051809
currentEventTriggerState->commandList =
18061810
lappend(currentEventTriggerState->commandList,
18071811
currentEventTriggerState->currentCommand);
1812+
1813+
MemoryContextSwitchTo(oldcxt);
18081814
}
18091815
else
18101816
pfree(currentEventTriggerState->currentCommand);

0 commit comments

Comments
 (0)