Fix potential NULL-pointer dereference.

robertmhaas · robertmhaas · commit c8df9477f8ce · 2014-11-10T15:22:46.000-05:00
Commit 2781b4b arranged to defer the setup of after-trigger-related data structures, but AfterTriggerPendingOnRel didn't get the memo.
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
@@ -4776,7 +4776,7 @@ AfterTriggerPendingOnRel(Oid relid)
 	 * if TRUNCATE/etc is executed by a function or trigger within an updating
 	 * query on the same relation, which is pretty perverse, but let's check.
 	 */
-	for (depth = 0; depth <= afterTriggers.query_depth; depth++)
+	for (depth = 0; depth <= afterTriggers.query_depth && depth < afterTriggers.maxquerydepth; depth++)
 	{
 		for_each_event_chunk(event, chunk, afterTriggers.query_stack[depth])
 		{

Original file line number	Diff line number	Diff line change
`@@ -4776,7 +4776,7 @@ AfterTriggerPendingOnRel(Oid relid)`
`4776`	`4776`	`* if TRUNCATE/etc is executed by a function or trigger within an updating`
`4777`	`4777`	`* query on the same relation, which is pretty perverse, but let's check.`
`4778`	`4778`	`*/`
`4779`		`- for (depth = 0; depth <= afterTriggers.query_depth; depth++)`
	`4779`	`+ for (depth = 0; depth <= afterTriggers.query_depth && depth < afterTriggers.maxquerydepth; depth++)`
`4780`	`4780`	`{`
`4781`	`4781`	`for_each_event_chunk(event, chunk, afterTriggers.query_stack[depth])`
`4782`	`4782`	`{`