diff options
| author | Bruce Momjian <bruce@momjian.us> | 2007-01-25 04:17:56 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2007-01-25 04:17:56 +0000 |
| commit | ebe2830613a7dcb017c26475de7ef54a7ad7e0f3 (patch) | |
| tree | 1a6347338790e7894b86c1584fb02f561c9446f4 /src/backend/commands | |
| parent | 4e978c4e27e1d7b22d7ae332c5c02dc9a91765e3 (diff) | |
| download | postgresql-ebe2830613a7dcb017c26475de7ef54a7ad7e0f3.tar.gz postgresql-ebe2830613a7dcb017c26475de7ef54a7ad7e0f3.zip | |
Properly detoast access to bytea field pg_trigger.tgargs. Old code
might cause server crash.
Backpatch to 8.2.X.
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 5 | ||||
| -rw-r--r-- | src/backend/commands/trigger.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index ea80c4e8286..0aaf47a19dc 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.206 2006/10/13 21:43:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.206.2.1 2007/01/25 04:17:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1790,8 +1790,7 @@ update_ri_trigger_args(Oid relid, * line; so does trigger.c ... */ tgnargs = pg_trigger->tgnargs; - val = (bytea *) - DatumGetPointer(fastgetattr(tuple, + val = DatumGetByteaP(fastgetattr(tuple, Anum_pg_trigger_tgargs, tgrel->rd_att, &isnull)); if (isnull || tgnargs < RI_FIRST_ATTNAME_ARGNO || diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 58d8cbabfd4..2f602d742e2 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.210 2006/11/23 01:14:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.210.2.1 2007/01/25 04:17:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -906,8 +906,7 @@ RelationBuildTriggers(Relation relation) char *p; int i; - val = (bytea *) - DatumGetPointer(fastgetattr(htup, + val = DatumGetByteaP(fastgetattr(htup, Anum_pg_trigger_tgargs, tgrel->rd_att, &isnull)); if (isnull) |