mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

arrays: tighten checks for multi-dimensional input

Browse Source 
Previously an input array string that started with a single-element
array dimension would then later accept a multi-dimensional segment.

BACKWARD INCOMPATIBILITY
This commit is contained in:
Bruce Momjian 2014-02-01 10:49:17 -05:00
parent 858ec11858
commit d0ee93797d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/adt/arrayfuncs.c
View File

@ -425,8 +425,8 @@ ArrayCount(const char *str, int *dim, char typdelim)
for (i = 0; i < MAXDIM; ++i)
{
temp[i] = dim[i] = 0;
nelems_last[i] = nelems[i] = 1;
temp[i] = dim[i] = nelems_last[i] = 0;
nelems[i] = 1;
}
ptr = str;
@ -540,8 +540,8 @@ ArrayCount(const char *str, int *dim, char typdelim)
errmsg("malformed array literal: \"%s\"", str)));
nest_level--;
if ((nelems_last[nest_level] != 1) &&
(nelems[nest_level] != nelems_last[nest_level]))
if (nelems_last[nest_level] != 0 &&
nelems[nest_level] != nelems_last[nest_level])
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("multidimensional arrays must have "

2
src/test/regress/expected/arrays.out
View File

@ -1491,7 +1491,7 @@ select cardinality('{{1,2},{3,4},{5,6}}'::int[]);
6
(1 row)
select cardinality('{{{1}},{{2,3},{3,4}}}'::int[]);
select cardinality('{{{1,9},{5,6}},{{2,3},{3,4}}}'::int[]);
cardinality
-------------
8

2
src/test/regress/sql/arrays.sql
View File

@ -425,7 +425,7 @@ select cardinality(array[1,2,3]);
select cardinality('[2:4]={5,6,7}'::int[]);
select cardinality('{{1,2}}'::int[]);
select cardinality('{{1,2},{3,4},{5,6}}'::int[]);
select cardinality('{{{1}},{{2,3},{3,4}}}'::int[]);
select cardinality('{{{1,9},{5,6}},{{2,3},{3,4}}}'::int[]);
select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;