Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit761a568

Browse files
committed
Fix confusion about event trigger vs. plain function in plpgsql.
The function hash table keys made by compute_function_hashkey() failedto distinguish event-trigger call context from regular call context.This meant that once we'd successfully made a hash entry for an eventtrigger (either by validation, or by normal use as an event trigger),an attempt to call the trigger function as a plain function wouldfind this hash entry and thereby bypass the you-can't-do-that check indo_compile(). Thus we'd attempt to execute the function, leading tostrange errors or even crashes, depending on function contents andserver 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 ABIbreak, even assuming that any third-party code is looking at thesehash keys. (I considered replacing isTrigger with a PLpgSQL_trigtypeenum field, but felt that that carried some API/ABI risk. Maybe weshould change it in HEAD though.)Per bug #16266 from Alexander Lakhin. This has been broken sinceevent triggers were invented, so back-patch to all supported branches.Discussion:https://postgr.es/m/16266-fcd7f838e97ba5d4@postgresql.org
1 parent2ed19a4 commit761a568

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

‎src/pl/plpgsql/src/pl_comp.c‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,12 +2418,19 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
24182418

24192419
/* get call context */
24202420
hashkey->isTrigger=CALLED_AS_TRIGGER(fcinfo);
2421+
hashkey->isEventTrigger=CALLED_AS_EVENT_TRIGGER(fcinfo);
24212422

24222423
/*
2423-
* if trigger, get its OID. In validation mode we do not know what
2424-
* relation or transition table names are intended to be used, so we leave
2425-
* trigOid zero; the hash entry built in this case will never really be
2426-
* used.
2424+
* If DML trigger, include trigger's OID in the hash, so that each trigger
2425+
* usage gets a different hash entry, allowing for e.g. different relation
2426+
* rowtypes or transition table names. In validation mode we do not know
2427+
* what relation or transition table names are intended to be used, so we
2428+
* leave trigOid zero; the hash entry built in this case will never be
2429+
* used for any actual calls.
2430+
*
2431+
* We don't currently need to distinguish different event trigger usages
2432+
* in the same way, since the special parameter variables don't vary in
2433+
* type in that case.
24272434
*/
24282435
if (hashkey->isTrigger&& !forValidator)
24292436
{

‎src/pl/plpgsql/src/plpgsql.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,15 +939,16 @@ typedef struct PLpgSQL_func_hashkey
939939
{
940940
OidfuncOid;
941941

942-
boolisTrigger;/* true if called as a trigger */
942+
boolisTrigger;/* true if called as a DML trigger */
943+
boolisEventTrigger;/* true if called as an event trigger */
943944

944945
/* be careful that pad bytes in this struct get zeroed! */
945946

946947
/*
947948
* For a trigger function, the OID of the trigger is part of the hash key
948949
* --- we want to compile the trigger function separately for each trigger
949950
* it is used with, in case the rowtype or transition table names are
950-
* different. Zero if not called as a trigger.
951+
* different. Zero if not called as aDMLtrigger.
951952
*/
952953
OidtrigOid;
953954

‎src/test/regress/expected/event_trigger.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ BEGIN
99
RAISE NOTICE 'test_event_trigger: % %', tg_event, tg_tag;
1010
END
1111
$$ language plpgsql;
12+
-- should fail, can't call it as a plain function
13+
SELECT test_event_trigger();
14+
ERROR: trigger functions can only be called as triggers
15+
CONTEXT: compilation of PL/pgSQL function "test_event_trigger" near line 1
1216
-- should fail, event triggers cannot have declared arguments
1317
create function test_event_trigger_arg(name text)
1418
returns event_trigger as $$ BEGIN RETURN 1; END $$ language plpgsql;

‎src/test/regress/sql/event_trigger.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ BEGIN
1010
END
1111
$$ language plpgsql;
1212

13+
-- should fail, can't call it as a plain function
14+
SELECT test_event_trigger();
15+
1316
-- should fail, event triggers cannot have declared arguments
1417
createfunctiontest_event_trigger_arg(nametext)
1518
returns event_triggeras $$BEGIN RETURN1; END $$ language plpgsql;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp