Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9e0247a

Browse files
committed
In CREATE AGGREGATE, allow the transition datatype to be "internal", but only
if the user is superuser. This makes available to extension modules the samesort of trick being practiced by array_agg(). The reason for the superuserrestriction is that you could crash the system by connecting up anincompatible pair of internal-using functions as an aggregate. It shouldn'tinterfere with any legitimate use, since you'd have to be superuser to createthe internal-using transition and final functions anyway.
1 parentfbaa172 commit9e0247a

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

‎src/backend/catalog/pg_aggregate.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.96 2008/11/02 01:45:27 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.97 2008/11/14 19:47:50 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -61,6 +61,7 @@ AggregateCreate(const char *aggName,
6161
Oidfinalfn=InvalidOid;/* can be omitted */
6262
Oidsortop=InvalidOid;/* can be omitted */
6363
boolhasPolyArg;
64+
boolhasInternalArg;
6465
Oidrettype;
6566
Oidfinaltype;
6667
Oid*fnArgs;
@@ -78,15 +79,15 @@ AggregateCreate(const char *aggName,
7879
if (!aggtransfnName)
7980
elog(ERROR,"aggregate must have a transition function");
8081

81-
/* check for polymorphic arguments */
82+
/* check for polymorphicand INTERNALarguments */
8283
hasPolyArg= false;
84+
hasInternalArg= false;
8385
for (i=0;i<numArgs;i++)
8486
{
8587
if (IsPolymorphicType(aggArgTypes[i]))
86-
{
8788
hasPolyArg= true;
88-
break;
89-
}
89+
elseif (aggArgTypes[i]==INTERNALOID)
90+
hasInternalArg= true;
9091
}
9192

9293
/*
@@ -177,6 +178,18 @@ AggregateCreate(const char *aggName,
177178
errdetail("An aggregate returning a polymorphic type "
178179
"must have at least one polymorphic argument.")));
179180

181+
/*
182+
* Also, the return type can't be INTERNAL unless there's at least one
183+
* INTERNAL argument. This is the same type-safety restriction we
184+
* enforce for regular functions, but at the level of aggregates. We
185+
* must test this explicitly because we allow INTERNAL as the transtype.
186+
*/
187+
if (finaltype==INTERNALOID&& !hasInternalArg)
188+
ereport(ERROR,
189+
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
190+
errmsg("unsafe use of pseudo-type \"internal\""),
191+
errdetail("A function returning \"internal\" must have at least one \"internal\" argument.")));
192+
180193
/* handle sortop, if supplied */
181194
if (aggsortopName)
182195
{

‎src/backend/commands/aggregatecmds.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.46 2008/06/08 21:09:48 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.47 2008/11/14 19:47:50 tgl Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -173,15 +173,24 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters)
173173
*
174174
* transtype can't be a pseudo-type, since we need to be able to store
175175
* values of the transtype. However, we can allow polymorphic transtype
176-
* in some cases (AggregateCreate will check).
176+
* in some cases (AggregateCreate will check). Also, we allow "internal"
177+
* for functions that want to pass pointers to private data structures;
178+
* but allow that only to superusers, since you could crash the system
179+
* (or worse) by connecting up incompatible internal-using functions
180+
* in an aggregate.
177181
*/
178182
transTypeId=typenameTypeId(NULL,transType,NULL);
179183
if (get_typtype(transTypeId)==TYPTYPE_PSEUDO&&
180184
!IsPolymorphicType(transTypeId))
181-
ereport(ERROR,
182-
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
183-
errmsg("aggregate transition data type cannot be %s",
184-
format_type_be(transTypeId))));
185+
{
186+
if (transTypeId==INTERNALOID&&superuser())
187+
/* okay */ ;
188+
else
189+
ereport(ERROR,
190+
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
191+
errmsg("aggregate transition data type cannot be %s",
192+
format_type_be(transTypeId))));
193+
}
185194

186195
/*
187196
* Most of the argument-checking is done inside of AggregateCreate

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp