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

Commit0bd4da2

Browse files
committed
Ensure that typmod decoration on a datatype name is validated in all cases,
even in code paths where we don't pay any subsequent attention to the typmodvalue. This seems needed in view of the fact that 8.3's generalized typmodsupport will accept a lot of bogus syntax, such as "timestamp(foo)" or"record(int, 42)" --- if we allow such things to pass without comment,users will get confused. Per a recent example from Greg Stark.To implement this in a way that's not very vulnerable to futurebugs-of-omission, refactor the API of parse_type.c's TypeName lookup routinesso that typmod validation is folded into the base lookup operation. Callerscan still choose not to receive the encoded typmod, but we'll check thedecoration anyway if it's present.
1 parent6b8cc88 commit0bd4da2

File tree

18 files changed

+341
-288
lines changed

18 files changed

+341
-288
lines changed

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.120 2007/01/05 22:19:21 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.121 2007/11/1119:22:48 tgl Exp $
1212
*
1313
* NOTES
1414
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -534,8 +534,7 @@ BuildDescForRelation(List *schema)
534534
attnum++;
535535

536536
attname=entry->colname;
537-
atttypid=typenameTypeId(NULL,entry->typename);
538-
atttypmod=typenameTypeMod(NULL,entry->typename,atttypid);
537+
atttypid=typenameTypeId(NULL,entry->typename,&atttypmod);
539538
attdim=list_length(entry->typename->arrayBounds);
540539

541540
if (entry->typename->setof)

‎src/backend/commands/aggregatecmds.c

Lines changed: 4 additions & 4 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.43 2007/04/02 03:49:37 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.44 2007/11/11 19:22:48 tgl Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -142,7 +142,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters)
142142
{
143143
numArgs=1;
144144
aggArgTypes= (Oid*)palloc(sizeof(Oid));
145-
aggArgTypes[0]=typenameTypeId(NULL,baseType);
145+
aggArgTypes[0]=typenameTypeId(NULL,baseType,NULL);
146146
}
147147
}
148148
else
@@ -164,7 +164,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters)
164164
{
165165
TypeName*curTypeName= (TypeName*)lfirst(lc);
166166

167-
aggArgTypes[i++]=typenameTypeId(NULL,curTypeName);
167+
aggArgTypes[i++]=typenameTypeId(NULL,curTypeName,NULL);
168168
}
169169
}
170170

@@ -175,7 +175,7 @@ DefineAggregate(List *name, List *args, bool oldstyle, List *parameters)
175175
* values of the transtype. However, we can allow polymorphic transtype
176176
* in some cases (AggregateCreate will check).
177177
*/
178-
transTypeId=typenameTypeId(NULL,transType);
178+
transTypeId=typenameTypeId(NULL,transType,NULL);
179179
if (get_typtype(transTypeId)==TYPTYPE_PSEUDO&&
180180
!IsPolymorphicType(transTypeId))
181181
ereport(ERROR,

‎src/backend/commands/comment.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.97 2007/08/21 01:11:14 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.98 2007/11/11 19:22:48 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -874,7 +874,7 @@ CommentType(List *typename, char *comment)
874874

875875
/* Find the type's oid */
876876

877-
oid=typenameTypeId(NULL,tname);
877+
oid=typenameTypeId(NULL,tname,NULL);
878878

879879
/* Check object security */
880880

@@ -1451,8 +1451,8 @@ CommentCast(List *qualname, List *arguments, char *comment)
14511451
targettype= (TypeName*)linitial(arguments);
14521452
Assert(IsA(targettype,TypeName));
14531453

1454-
sourcetypeid=typenameTypeId(NULL,sourcetype);
1455-
targettypeid=typenameTypeId(NULL,targettype);
1454+
sourcetypeid=typenameTypeId(NULL,sourcetype,NULL);
1455+
targettypeid=typenameTypeId(NULL,targettype,NULL);
14561456

14571457
tuple=SearchSysCache(CASTSOURCETARGET,
14581458
ObjectIdGetDatum(sourcetypeid),

‎src/backend/commands/functioncmds.c

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.85 2007/09/03 18:46:29 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.86 2007/11/11 19:22:48 tgl Exp $
1414
*
1515
* DESCRIPTION
1616
* These routines take the parse tree and pick out the
@@ -76,12 +76,13 @@ compute_return_type(TypeName *returnType, Oid languageOid,
7676
Oid*prorettype_p,bool*returnsSet_p)
7777
{
7878
Oidrettype;
79+
Typetyptup;
7980

80-
rettype=LookupTypeName(NULL,returnType);
81+
typtup=LookupTypeName(NULL,returnType,NULL);
8182

82-
if (OidIsValid(rettype))
83+
if (typtup)
8384
{
84-
if (!get_typisdefined(rettype))
85+
if (!((Form_pg_type)GETSTRUCT(typtup))->typisdefined)
8586
{
8687
if (languageOid==SQLlanguageId)
8788
ereport(ERROR,
@@ -94,6 +95,8 @@ compute_return_type(TypeName *returnType, Oid languageOid,
9495
errmsg("return type %s is only a shell",
9596
TypeNameToString(returnType))));
9697
}
98+
rettype=typeTypeId(typtup);
99+
ReleaseSysCache(typtup);
97100
}
98101
else
99102
{
@@ -114,6 +117,13 @@ compute_return_type(TypeName *returnType, Oid languageOid,
114117
(errcode(ERRCODE_UNDEFINED_OBJECT),
115118
errmsg("type \"%s\" does not exist",typnam)));
116119

120+
/* Reject if there's typmod decoration, too */
121+
if (returnType->typmods!=NIL)
122+
ereport(ERROR,
123+
(errcode(ERRCODE_SYNTAX_ERROR),
124+
errmsg("type modifier cannot be specified for shell type \"%s\"",
125+
typnam)));
126+
117127
/* Otherwise, go ahead and make a shell type */
118128
ereport(NOTICE,
119129
(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -175,11 +185,12 @@ examine_parameter_list(List *parameters, Oid languageOid,
175185
FunctionParameter*fp= (FunctionParameter*)lfirst(x);
176186
TypeName*t=fp->argType;
177187
Oidtoid;
188+
Typetyptup;
178189

179-
toid=LookupTypeName(NULL,t);
180-
if (OidIsValid(toid))
190+
typtup=LookupTypeName(NULL,t,NULL);
191+
if (typtup)
181192
{
182-
if (!get_typisdefined(toid))
193+
if (!((Form_pg_type)GETSTRUCT(typtup))->typisdefined)
183194
{
184195
/* As above, hard error if language is SQL */
185196
if (languageOid==SQLlanguageId)
@@ -193,13 +204,16 @@ examine_parameter_list(List *parameters, Oid languageOid,
193204
errmsg("argument type %s is only a shell",
194205
TypeNameToString(t))));
195206
}
207+
toid=typeTypeId(typtup);
208+
ReleaseSysCache(typtup);
196209
}
197210
else
198211
{
199212
ereport(ERROR,
200213
(errcode(ERRCODE_UNDEFINED_OBJECT),
201214
errmsg("type %s does not exist",
202215
TypeNameToString(t))));
216+
toid=InvalidOid;/* keep compiler quiet */
203217
}
204218

205219
if (t->setof)
@@ -1341,8 +1355,8 @@ CreateCast(CreateCastStmt *stmt)
13411355
ObjectAddressmyself,
13421356
referenced;
13431357

1344-
sourcetypeid=typenameTypeId(NULL,stmt->sourcetype);
1345-
targettypeid=typenameTypeId(NULL,stmt->targettype);
1358+
sourcetypeid=typenameTypeId(NULL,stmt->sourcetype,NULL);
1359+
targettypeid=typenameTypeId(NULL,stmt->targettype,NULL);
13461360

13471361
/* No pseudo-types allowed */
13481362
if (get_typtype(sourcetypeid)==TYPTYPE_PSEUDO)
@@ -1567,8 +1581,8 @@ DropCast(DropCastStmt *stmt)
15671581
ObjectAddressobject;
15681582

15691583
/* when dropping a cast, the types must exist even if you use IF EXISTS */
1570-
sourcetypeid=typenameTypeId(NULL,stmt->sourcetype);
1571-
targettypeid=typenameTypeId(NULL,stmt->targettype);
1584+
sourcetypeid=typenameTypeId(NULL,stmt->sourcetype,NULL);
1585+
targettypeid=typenameTypeId(NULL,stmt->targettype,NULL);
15721586

15731587
tuple=SearchSysCache(CASTSOURCETARGET,
15741588
ObjectIdGetDatum(sourcetypeid),

‎src/backend/commands/opclasscmds.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.54 2007/02/01 19:10:26 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.55 2007/11/11 19:22:48 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -327,7 +327,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
327327
errmsg("must be superuser to create an operator class")));
328328

329329
/* Look up the datatype */
330-
typeoid=typenameTypeId(NULL,stmt->datatype);
330+
typeoid=typenameTypeId(NULL,stmt->datatype,NULL);
331331

332332
#ifdefNOT_USED
333333
/* XXX this is unnecessary given the superuser check above */
@@ -481,7 +481,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
481481
ereport(ERROR,
482482
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
483483
errmsg("storage type specified more than once")));
484-
storageoid=typenameTypeId(NULL,item->storedtype);
484+
storageoid=typenameTypeId(NULL,item->storedtype,NULL);
485485

486486
#ifdefNOT_USED
487487
/* XXX this is unnecessary given the superuser check above */
@@ -1035,12 +1035,12 @@ processTypesSpec(List *args, Oid *lefttype, Oid *righttype)
10351035
Assert(args!=NIL);
10361036

10371037
typeName= (TypeName*)linitial(args);
1038-
*lefttype=typenameTypeId(NULL,typeName);
1038+
*lefttype=typenameTypeId(NULL,typeName,NULL);
10391039

10401040
if (list_length(args)>1)
10411041
{
10421042
typeName= (TypeName*)lsecond(args);
1043-
*righttype=typenameTypeId(NULL,typeName);
1043+
*righttype=typenameTypeId(NULL,typeName,NULL);
10441044
}
10451045
else
10461046
*righttype=*lefttype;

‎src/backend/commands/operatorcmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.36 2007/06/02 23:36:35 petere Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.37 2007/11/11 19:22:48 tgl Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -149,9 +149,9 @@ DefineOperator(List *names, List *parameters)
149149

150150
/* Transform type names to type OIDs */
151151
if (typeName1)
152-
typeId1=typenameTypeId(NULL,typeName1);
152+
typeId1=typenameTypeId(NULL,typeName1,NULL);
153153
if (typeName2)
154-
typeId2=typenameTypeId(NULL,typeName2);
154+
typeId2=typenameTypeId(NULL,typeName2,NULL);
155155

156156
/*
157157
* now have OperatorCreate do all the work..

‎src/backend/commands/prepare.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2002-2007, PostgreSQL Global Development Group
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.77 2007/06/2322:12:50 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.78 2007/11/11 19:22:48 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -90,7 +90,7 @@ PrepareQuery(PrepareStmt *stmt, const char *queryString)
9090
foreach(l,stmt->argtypes)
9191
{
9292
TypeName*tn=lfirst(l);
93-
Oidtoid=typenameTypeId(pstate,tn);
93+
Oidtoid=typenameTypeId(pstate,tn,NULL);
9494

9595
argtypes[i++]=toid;
9696
}

‎src/backend/commands/tablecmds.c

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.234 2007/10/12 18:55:12 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.235 2007/11/11 19:22:48 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -899,8 +899,7 @@ MergeAttributes(List *schema, List *supers, bool istemp,
899899
(errmsg("merging multiple inherited definitions of column \"%s\"",
900900
attributeName)));
901901
def= (ColumnDef*)list_nth(inhSchema,exist_attno-1);
902-
defTypeId=typenameTypeId(NULL,def->typename);
903-
deftypmod=typenameTypeMod(NULL,def->typename,defTypeId);
902+
defTypeId=typenameTypeId(NULL,def->typename,&deftypmod);
904903
if (defTypeId!=attribute->atttypid||
905904
deftypmod!=attribute->atttypmod)
906905
ereport(ERROR,
@@ -1044,10 +1043,8 @@ MergeAttributes(List *schema, List *supers, bool istemp,
10441043
(errmsg("merging column \"%s\" with inherited definition",
10451044
attributeName)));
10461045
def= (ColumnDef*)list_nth(inhSchema,exist_attno-1);
1047-
defTypeId=typenameTypeId(NULL,def->typename);
1048-
deftypmod=typenameTypeMod(NULL,def->typename,defTypeId);
1049-
newTypeId=typenameTypeId(NULL,newdef->typename);
1050-
newtypmod=typenameTypeMod(NULL,newdef->typename,newTypeId);
1046+
defTypeId=typenameTypeId(NULL,def->typename,&deftypmod);
1047+
newTypeId=typenameTypeId(NULL,newdef->typename,&newtypmod);
10511048
if (defTypeId!=newTypeId||deftypmod!=newtypmod)
10521049
ereport(ERROR,
10531050
(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -3018,8 +3015,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
30183015
int32ctypmod;
30193016

30203017
/* Okay if child matches by type */
3021-
ctypeId=typenameTypeId(NULL,colDef->typename);
3022-
ctypmod=typenameTypeMod(NULL,colDef->typename,ctypeId);
3018+
ctypeId=typenameTypeId(NULL,colDef->typename,&ctypmod);
30233019
if (ctypeId!=childatt->atttypid||
30243020
ctypmod!=childatt->atttypmod)
30253021
ereport(ERROR,
@@ -3074,10 +3070,9 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
30743070
MaxHeapAttributeNumber)));
30753071
i=minattnum+1;
30763072

3077-
typeTuple=typenameType(NULL,colDef->typename);
3073+
typeTuple=typenameType(NULL,colDef->typename,&typmod);
30783074
tform= (Form_pg_type)GETSTRUCT(typeTuple);
30793075
typeOid=HeapTupleGetOid(typeTuple);
3080-
typmod=typenameTypeMod(NULL,colDef->typename,typeOid);
30813076

30823077
/* make sure datatype is legal for a column */
30833078
CheckAttributeType(colDef->colname,typeOid);
@@ -4777,8 +4772,7 @@ ATPrepAlterColumnType(List **wqueue,
47774772
colName)));
47784773

47794774
/* Look up the target type */
4780-
targettype=typenameTypeId(NULL,typename);
4781-
targettypmod=typenameTypeMod(NULL,typename,targettype);
4775+
targettype=typenameTypeId(NULL,typename,&targettypmod);
47824776

47834777
/* make sure datatype is legal for a column */
47844778
CheckAttributeType(colName,targettype);
@@ -4905,10 +4899,9 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
49054899
colName)));
49064900

49074901
/* Look up the target type (should not fail, since prep found it) */
4908-
typeTuple=typenameType(NULL,typename);
4902+
typeTuple=typenameType(NULL,typename,&targettypmod);
49094903
tform= (Form_pg_type)GETSTRUCT(typeTuple);
49104904
targettype=HeapTupleGetOid(typeTuple);
4911-
targettypmod=typenameTypeMod(NULL,typename,targettype);
49124905

49134906
/*
49144907
* If there is a default expression for the column, get it and ensure we

0 commit comments

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