Commit25c0083

committed

Add defenses against nulls-in-arrays to contrib/ltree. Possibly it'd

be useful to actually do something with nulls, rather than reject them,but I'll just close the hole for now.

1 parent1e9a1a7 commit25c0083Copy full SHA for 25c0083

File tree

+33

-0

lines changed

+33

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,10 @@ _ltree_compress(PG_FUNCTION_ARGS)`
`76`	`76`	`ereport(ERROR,`
`77`	`77`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`78`	`78`	`errmsg("array must be one-dimensional")));`
	`79`	`+if (ARR_HASNULL(val))`
	`80`	`+ereport(ERROR,`
	`81`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`82`	`+errmsg("array must not contain nulls")));`
`79`	`83`
`80`	`84`	`key= (ltree_gist*)palloc(len);`
`81`	`85`	`key->len=len;`
`@@ -518,6 +522,10 @@ _arrq_cons(ltree_gist * key, ArrayType *_query)`
`518`	`522`	`ereport(ERROR,`
`519`	`523`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`520`	`524`	`errmsg("array must be one-dimensional")));`
	`525`	`+if (ARR_HASNULL(_query))`
	`526`	`+ereport(ERROR,`
	`527`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`528`	`+errmsg("array must not contain nulls")));`
`521`	`529`
`522`	`530`	`while (num>0)`
`523`	`531`	`{`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ array_iterator(ArrayType la, PGCALL2 callback, void param, ltree ** found)`
`47`	`47`	`ereport(ERROR,`
`48`	`48`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`49`	`49`	`errmsg("array must be one-dimensional")));`
	`50`	`+if (ARR_HASNULL(la))`
	`51`	`+ereport(ERROR,`
	`52`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`53`	`+errmsg("array must not contain nulls")));`
`50`	`54`
`51`	`55`	`if (found)`
`52`	`56`	`*found=NULL;`
`@@ -143,6 +147,10 @@ _lt_q_regex(PG_FUNCTION_ARGS)`
`143`	`147`	`ereport(ERROR,`
`144`	`148`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`145`	`149`	`errmsg("array must be one-dimensional")));`
	`150`	`+if (ARR_HASNULL(_query))`
	`151`	`+ereport(ERROR,`
	`152`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`153`	`+errmsg("array must not contain nulls")));`
`146`	`154`
`147`	`155`	`while (num>0)`
`148`	`156`	`{`
`@@ -293,6 +301,15 @@ _lca(PG_FUNCTION_ARGS)`
`293`	`301`	`ltree**a,`
`294`	`302`	`*res;`
`295`	`303`
	`304`	`+if (ARR_NDIM(la)!=1)`
	`305`	`+ereport(ERROR,`
	`306`	`+(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
	`307`	`+errmsg("array must be one-dimensional")));`
	`308`	`+if (ARR_HASNULL(la))`
	`309`	`+ereport(ERROR,`
	`310`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`311`	`+errmsg("array must not contain nulls")));`
	`312`	`+`
`296`	`313`	`a= (ltree*)palloc(sizeof(ltree)*num);`
`297`	`314`	`while (num>0)`
`298`	`315`	`{`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,10 @@ lt_q_regex(PG_FUNCTION_ARGS)`
`328`	`328`	`ereport(ERROR,`
`329`	`329`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`330`	`330`	`errmsg("array must be one-dimensional")));`
	`331`	`+if (ARR_HASNULL(_query))`
	`332`	`+ereport(ERROR,`
	`333`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`334`	`+errmsg("array must not contain nulls")));`
`331`	`335`
`332`	`336`	`while (num>0)`
`333`	`337`	`{`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -607,6 +607,10 @@ arrq_cons(ltree_gist * key, ArrayType *_query)`
`607`	`607`	`ereport(ERROR,`
`608`	`608`	`(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),`
`609`	`609`	`errmsg("array must be one-dimensional")));`
	`610`	`+if (ARR_HASNULL(_query))`
	`611`	`+ereport(ERROR,`
	`612`	`+(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),`
	`613`	`+errmsg("array must not contain nulls")));`
`610`	`614`
`611`	`615`	`while (num>0)`
`612`	`616`	`{`

Comments

(0)