Commit325feae

committed

Check length of enum literals on definition and input to make sure they will fit in a name field and not cause syscache errors.

1 parentffb2744 commit325feaeCopy full SHA for 325feae

File tree

+24

-2

lines changed

+24

-2

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.1 2007/04/0203:49:37 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.2 2007/04/0222:14:17 adunstan Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -78,6 +78,19 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)`
`78`	`78`	`{`
`79`	`79`	`char*lab=strVal(lfirst(lc));`
`80`	`80`
	`81`	`+/*`
	`82`	`+ * labels are stored in a name field, for easier syscache lookup, so`
	`83`	`+ * check the length to make sure it's within range.`
	`84`	`+ */`
	`85`	`+`
	`86`	`+if (strlen(lab)> (NAMEDATALEN-1))`
	`87`	`+ereport(ERROR,`
	`88`	`+(errcode(ERRCODE_INVALID_NAME),`
	`89`	`+errmsg("invalid enum label \"%s\", must be %d characters or less",`
	`90`	`+lab,`
	`91`	`+NAMEDATALEN-1)));`
	`92`	`+`
	`93`	`+`
`81`	`94`	`values[Anum_pg_enum_enumtypid-1]=ObjectIdGetDatum(enumTypeOid);`
`82`	`95`	`namestrcpy(&enumlabel,lab);`
`83`	`96`	`values[Anum_pg_enum_enumlabel-1]=NameGetDatum(&enumlabel);`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/enum.c,v 1.1 2007/04/0203:49:39 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/enum.c,v 1.2 2007/04/0222:14:17 adunstan Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -45,6 +45,15 @@ cstring_enum(char *name, Oid enumtypoid)`
`45`	`45`	`HeapTupletup;`
`46`	`46`	`Oidenumoid;`
`47`	`47`
	`48`	`+/* must check length to prevent Assert failure within SearchSysCache */`
	`49`	`+`
	`50`	`+if (strlen(name) >=NAMEDATALEN)`
	`51`	`+ereport(ERROR,`
	`52`	`+ (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),`
	`53`	`+errmsg("invalid input value for enum %s: \"%s\"",`
	`54`	`+format_type_be(enumtypoid),`
	`55`	`+name)));`
	`56`	`+`
`48`	`57`	`tup=SearchSysCache(ENUMTYPOIDNAME,`
`49`	`58`	`ObjectIdGetDatum(enumtypoid),`
`50`	`59`	`CStringGetDatum(name),`

Comments

(0)