mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus CALLED_AS_TRIGGER() defenses.

Browse Source 
contrib/lo's lo_manage() thought it could use
trigdata->tg_trigger->tgname in its error message about
not being called as a trigger.  That naturally led to a core dump.

unique_key_recheck() figured it could Assert that fcinfo->context
is a TriggerData node in advance of having checked that it's
being called as a trigger.  That's harmless in production builds,
and perhaps not that easy to reach in any case, but it's logically
wrong.

The first of these per bug #16340 from William Crowell;
the second from manual inspection of other CALLED_AS_TRIGGER
call sites.

Back-patch the lo.c change to all supported branches, the
other to v10 where the thinko crept in.

Discussion: https://postgr.es/m/16340-591c7449dc7c8c47@postgresql.org
This commit is contained in:
Tom Lane 2020-04-03 11:24:56 -04:00
parent 42da1db7b9
commit 7b15522834
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/lo/lo.c
View File

@ -33,8 +33,7 @@ lo_manage(PG_FUNCTION_ARGS)
HeapTuple trigtuple; /* The original value of tuple */ HeapTuple trigtuple; /* The original value of tuple */
if (!CALLED_AS_TRIGGER(fcinfo)) /* internal error */ if (!CALLED_AS_TRIGGER(fcinfo)) /* internal error */
elog(ERROR, "%s: not fired by trigger manager", elog(ERROR, "lo_manage: not fired by trigger manager");
trigdata->tg_trigger->tgname);
if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) /* internal error */ if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) /* internal error */
elog(ERROR, "%s: must be fired for row", elog(ERROR, "%s: must be fired for row",

2
src/backend/commands/constraint.c
View File

@ -37,7 +37,7 @@
Datum Datum
unique_key_recheck(PG_FUNCTION_ARGS) unique_key_recheck(PG_FUNCTION_ARGS)
{ {
TriggerData *trigdata = castNode(TriggerData, fcinfo->context); TriggerData *trigdata = (TriggerData *) fcinfo->context;
const char *funcname = "unique_key_recheck"; const char *funcname = "unique_key_recheck";
HeapTuple new_row; HeapTuple new_row;
ItemPointerData tmptid; ItemPointerData tmptid;