Commit5af6b2a

committed

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

might cause server crash.Backpatch to 8.2.X.

1 parent2512817 commit5af6b2aCopy full SHA for 5af6b2a

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.210 2007/01/05 22:19:26 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.211 2007/01/25 04:17:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1800,8 +1800,7 @@ update_ri_trigger_args(Oid relid,`
`1800`	`1800`	`* line; so does trigger.c ...`
`1801`	`1801`	`*/`
`1802`	`1802`	`tgnargs=pg_trigger->tgnargs;`
`1803`		`-val= (bytea*)`
`1804`		`-DatumGetPointer(fastgetattr(tuple,`
	`1803`	`+val=DatumGetByteaP(fastgetattr(tuple,`
`1805`	`1804`	`Anum_pg_trigger_tgargs,`
`1806`	`1805`	`tgrel->rd_att,&isnull));`
`1807`	`1806`	`if (isnull\|\|tgnargs<RI_FIRST_ATTNAME_ARGNO\|\|`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.211 2007/01/05 22:19:26 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.212 2007/01/25 04:17:46 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -906,8 +906,7 @@ RelationBuildTriggers(Relation relation)`
`906`	`906`	`char*p;`
`907`	`907`	`inti;`
`908`	`908`
`909`		`-val= (bytea*)`
`910`		`-DatumGetPointer(fastgetattr(htup,`
	`909`	`+val=DatumGetByteaP(fastgetattr(htup,`
`911`	`910`	`Anum_pg_trigger_tgargs,`
`912`	`911`	`tgrel->rd_att,&isnull));`
`913`	`912`	`if (isnull)`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.245 2007/01/20 23:13:01 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.246 2007/01/25 04:17:46 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -529,8 +529,7 @@ pg_get_triggerdef(PG_FUNCTION_ARGS)`
`529`	`529`	`char*p;`
`530`	`530`	`inti;`
`531`	`531`
`532`		`-val= (bytea*)`
`533`		`-DatumGetPointer(fastgetattr(ht_trig,`
	`532`	`+val=DatumGetByteaP(fastgetattr(ht_trig,`
`534`	`533`	`Anum_pg_trigger_tgargs,`
`535`	`534`	`tgrel->rd_att,&isnull));`
`536`	`535`	`if (isnull)`

Comments

(0)