rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly detoast access to bytea field pg_trigger.tgargs. Old code 

might cause server crash.

Backpatch to 8.2.X.
This commit is contained in:
Bruce Momjian 2007-01-25 04:17:46 +00:00
parent 251281767a
commit 5af6b2abe9
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/commands/tablecmds.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.210 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.211 2007/01/25 04:17:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1800,8 +1800,7 @@ update_ri_trigger_args(Oid relid,
* line; so does trigger.c ... * line; so does trigger.c ...
*/ */
tgnargs = pg_trigger->tgnargs; tgnargs = pg_trigger->tgnargs;
val = (bytea *) val = DatumGetByteaP(fastgetattr(tuple,
DatumGetPointer(fastgetattr(tuple,
Anum_pg_trigger_tgargs, Anum_pg_trigger_tgargs,
tgrel->rd_att, &isnull)); tgrel->rd_att, &isnull));
if (isnull || tgnargs < RI_FIRST_ATTNAME_ARGNO || if (isnull || tgnargs < RI_FIRST_ATTNAME_ARGNO ||

5
src/backend/commands/trigger.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.211 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.212 2007/01/25 04:17:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -906,8 +906,7 @@ RelationBuildTriggers(Relation relation)
char *p; char *p;
int i; int i;
val = (bytea *) val = DatumGetByteaP(fastgetattr(htup,
DatumGetPointer(fastgetattr(htup,
Anum_pg_trigger_tgargs, Anum_pg_trigger_tgargs,
tgrel->rd_att, &isnull)); tgrel->rd_att, &isnull));
if (isnull) if (isnull)

5
src/backend/utils/adt/ruleutils.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.245 2007/01/20 23:13:01 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.246 2007/01/25 04:17:46 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -529,8 +529,7 @@ pg_get_triggerdef(PG_FUNCTION_ARGS)
char *p; char *p;
int i; int i;
val = (bytea *) val = DatumGetByteaP(fastgetattr(ht_trig,
DatumGetPointer(fastgetattr(ht_trig,
Anum_pg_trigger_tgargs, Anum_pg_trigger_tgargs,
tgrel->rd_att, &isnull)); tgrel->rd_att, &isnull));
if (isnull) if (isnull)