diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-03 11:24:56 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-03 11:24:56 -0400 |
| commit | 85f0d470380902c8c62d0165c349c82d81c3e056 (patch) | |
| tree | 62af8a3e5fc194c7a9b4094ee9a785d47ec72e88 /src | |
| parent | de7561f7d87df7dff8c6b29ac0d6435795d42372 (diff) | |
Fix bogus CALLED_AS_TRIGGER() defenses.
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/constraint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c index e2544e51ed5..63ecc709d4d 100644 --- a/src/backend/commands/constraint.c +++ b/src/backend/commands/constraint.c @@ -37,7 +37,7 @@ Datum unique_key_recheck(PG_FUNCTION_ARGS) { - TriggerData *trigdata = castNode(TriggerData, fcinfo->context); + TriggerData *trigdata = (TriggerData *) fcinfo->context; const char *funcname = "unique_key_recheck"; HeapTuple new_row; ItemPointerData tmptid; |