summaryrefslogtreecommitdiff
path: root/src/backend/commands/trigger.c
diff options
context:
space:
mode:
authorRobert Haas2014-11-10 20:19:56 +0000
committerRobert Haas2014-11-10 20:22:46 +0000
commitc8df9477f8ce48b202de989984f90dd78e1bba31 (patch)
treecb98f42bbe0db4624d90002547b3384a5f19c997 /src/backend/commands/trigger.c
parentbf7ca15875988a88e97302e012d7c4808bef3ea9 (diff)
Fix potential NULL-pointer dereference.
Commit 2781b4bea7db357be59f9a5fd73ca1eb12ff5a79 arranged to defer the setup of after-trigger-related data structures, but AfterTriggerPendingOnRel didn't get the memo.
Diffstat (limited to 'src/backend/commands/trigger.c')
-rw-r--r--src/backend/commands/trigger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 31a5411140d..ebccfea3d7c 100644
--- 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])
{