Fix confusion about event trigger vs. plain function in plpgsql.

The function hash table keys made by compute_function_hashkey() failed
to distinguish event-trigger call context from regular call context.
This meant that once we'd successfully made a hash entry for an event
trigger (either by validation, or by normal use as an event trigger),
an attempt to call the trigger function as a plain function would
find this hash entry and thereby bypass the you-can't-do-that check in
do_compile().  Thus we'd attempt to execute the function, leading to
strange errors or even crashes, depending on function contents and
server version.

To fix, add an isEventTrigger field to PLpgSQL_func_hashkey,
paralleling the longstanding infrastructure for regular triggers.
This fits into what had been pad space, so there's no risk of an ABI
break, even assuming that any third-party code is looking at these
hash keys.  (I considered replacing isTrigger with a PLpgSQL_trigtype
enum field, but felt that that carried some API/ABI risk.  Maybe we
should change it in HEAD though.)

Per bug #16266 from Alexander Lakhin.  This has been broken since
event triggers were invented, so back-patch to all supported branches.

Discussion: https://postgr.es/m/16266-fcd7f838e97ba5d4@postgresql.org

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 53c150fa54ce7de2c035909f484c79c02a9f7b6b..34b8fd75616ed050dba2fb3f0a317e22c90d5de3 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -2415,11 +2415,16 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
 
    /* get call context */
    hashkey->isTrigger = CALLED_AS_TRIGGER(fcinfo);
+   hashkey->isEventTrigger = CALLED_AS_EVENT_TRIGGER(fcinfo);
 
    /*
     * if trigger, get relation OID.  In validation mode we do not know what
     * relation is intended to be used, so we leave trigrelOid zero; the hash
     * entry built in this case will never really be used.
+    *
+    * We don't currently need to distinguish different event trigger usages
+    * in the same way, since the special parameter variables don't vary in
+    * type in that case.
     */
    if (hashkey->isTrigger && !forValidator)
    {

diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index 92887caed36421871275aa6f014dcf11f9465d13..01e62b0b29a857e450e413f78fea2fc9eeac0390 100644 (file)
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -671,7 +671,8 @@ typedef struct PLpgSQL_func_hashkey
 {                              /* Hash lookup key for functions */
    Oid         funcOid;
 
-   bool        isTrigger;      /* true if called as a trigger */
+   bool        isTrigger;      /* true if called as a DML trigger */
+   bool        isEventTrigger; /* true if called as an event trigger */
 
    /* be careful that pad bytes in this struct get zeroed! */
 
@@ -679,7 +680,7 @@ typedef struct PLpgSQL_func_hashkey
     * For a trigger function, the OID of the relation triggered on is part of
     * the hash key --- we want to compile the trigger separately for each
     * relation it is used with, in case the rowtype is different.  Zero if
-    * not called as a trigger.
+    * not called as a DML trigger.
     */
    Oid         trigrelOid;
 

diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index 95387a888b468a8fdd075c0b00a1d463c265c256..5852d46f67c4703e70e0860a1e92081725558154 100644 (file)
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -9,6 +9,10 @@ BEGIN
     RAISE NOTICE 'test_event_trigger: % %', tg_event, tg_tag;
 END
 $$ language plpgsql;
+-- should fail, can't call it as a plain function
+SELECT test_event_trigger();
+ERROR:  trigger functions can only be called as triggers
+CONTEXT:  compilation of PL/pgSQL function "test_event_trigger" near line 1
 -- should fail, event triggers cannot have declared arguments
 create function test_event_trigger_arg(name text)
 returns event_trigger as $$ BEGIN RETURN 1; END $$ language plpgsql;

diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql
index ec220fc7ecdbddbb4ce9f16d097f1ef875006ebe..7d3288f4b32002591ef241f5ab3dbf52fd2a728f 100644 (file)
--- a/src/test/regress/sql/event_trigger.sql
+++ b/src/test/regress/sql/event_trigger.sql
@@ -10,6 +10,9 @@ BEGIN
 END
 $$ language plpgsql;
 
+-- should fail, can't call it as a plain function
+SELECT test_event_trigger();
+
 -- should fail, event triggers cannot have declared arguments
 create function test_event_trigger_arg(name text)
 returns event_trigger as $$ BEGIN RETURN 1; END $$ language plpgsql;