Fix overly tense optimization of PLpgSQL_func_hashkey: we must represent

the isTrigger state explicitly, not rely on nonzero-ness of trigrelOid
to indicate trigger-hood, because trigrelOid will be left zero when compiling
for validation.  The (useless) function hash entry built by the validator
was able to match an ordinary non-trigger call later in the same session,
thereby bypassing the check that is supposed to prevent such a call.
Per report from Alvaro.

It might be worth suppressing the useless hash entry altogether, but
that's a bigger change than I want to consider back-patching.

Back-patch to 8.0.  7.4 doesn't have the problem because it doesn't
have validation mode.

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 8b89f638a89abd7eed33010bc8eb5fdacf2a1808..9cbea679ff3417261f60dd4be96fb40a4db47b3c 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -1880,12 +1880,15 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
        /* get function OID */
        hashkey->funcOid = fcinfo->flinfo->fn_oid;
 
+       /* get call context */
+       hashkey->isTrigger = CALLED_AS_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.
         */
-       if (CALLED_AS_TRIGGER(fcinfo) && !forValidator)
+       if (hashkey->isTrigger && !forValidator)
        {
                TriggerData *trigdata = (TriggerData *) fcinfo->context;
 

diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index a8e6b6ede620365fd1c5e8b66609d843525443a7..361e7ca6dc75dbe15f0602ae11e55f715fbb82c1 100644 (file)
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -552,6 +552,10 @@ typedef struct PLpgSQL_func_hashkey
 {                                                              /* Hash lookup key for functions */
        Oid                     funcOid;
 
+       bool            isTrigger;              /* true if called as a trigger */
+
+       /* be careful that pad bytes in this struct get zeroed! */
+
        /*
         * For a trigger function, the OID of the relation triggered on is
         * part of the hashkey --- we want to compile the trigger separately