diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/sets.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/fmgr.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index 45a8b9d5080..33f1ed1a4a8 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/sets.c,v 1.61 2003/11/29 19:51:59 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/sets.c,v 1.62 2004/01/06 23:55:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -65,8 +65,9 @@ SetDefine(char *querystr, Oid elemType) false, /* security invoker */ false, /* isStrict (irrelevant, no args) */ PROVOLATILE_VOLATILE, /* assume unsafe */ - 0, /* parameterCount */ - NULL); /* parameterTypes */ + 0, /* parameterCount */ + NULL, /* parameterTypes */ + NULL); /* parameterNames */ /* * Since we're still inside this command of the transaction, we can't diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index a6d5246a4aa..c42dfba32b5 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.77 2003/11/29 19:52:01 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.78 2004/01/06 23:55:19 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -155,6 +155,8 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt, const FmgrBuiltin *fbp; HeapTuple procedureTuple; Form_pg_proc procedureStruct; + Datum prosrcdatum; + bool isnull; char *prosrc; /* @@ -214,8 +216,12 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt, * name of the internal function is stored in prosrc (it * doesn't have to be the same as the name of the alias!) */ + prosrcdatum = SysCacheGetAttr(PROCOID, procedureTuple, + Anum_pg_proc_prosrc, &isnull); + if (isnull) + elog(ERROR, "null prosrc"); prosrc = DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(&procedureStruct->prosrc))); + prosrcdatum)); fbp = fmgr_lookupByName(prosrc); if (fbp == NULL) ereport(ERROR, |