From a891fe979e3b6cbe50859e710d49398f73fb37fa Mon Sep 17 00:00:00 2001 From: pgaddict Date: Mon, 4 Sep 2023 22:28:29 +0800 Subject: [PATCH v4] resolve corner case. previously '{1,}'::int[] will not fail. now solved. when convert to array, before the right curly brace, we should not precede it with a comma seperator. also add some test cases. --- src/backend/utils/adt/arrayfuncs.c | 49 +++++++++++++++++----------- src/test/regress/expected/arrays.out | 36 +++++++++++++++++++- src/test/regress/sql/arrays.sql | 8 +++++ 3 files changed, 73 insertions(+), 20 deletions(-) diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 0b1650c5..45f2dbf1 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -188,7 +188,6 @@ array_in(PG_FUNCTION_ARGS) Oid typioparam; char *p; int nitems; - int nitems_according_to_dims; Datum *values; bool *nulls; bool hasnulls; @@ -233,6 +232,11 @@ array_in(PG_FUNCTION_ARGS) typdelim = my_extra->typdelim; typioparam = my_extra->typioparam; + for (int i = 0; i < MAXDIM; i++) + { + dim[i] = -1; + lBound[i] = 1; + } /* * Start processing the input string. * @@ -245,14 +249,12 @@ array_in(PG_FUNCTION_ARGS) if (ndim == 0) { - /* No array dimensions, so intuit dimensions from brace structure */ + /* No array dimensions, so init dimensions from brace structure */ if (*p != '{') ereturn(escontext, (Datum) 0, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), errmsg("malformed array literal: \"%s\"", string), errdetail("Array value must start with \"{\" or dimension information."))); - for (int i = 0; i < MAXDIM; i++) - lBound[i] = 1; } else { @@ -304,28 +306,17 @@ array_in(PG_FUNCTION_ARGS) initStringInfo(&buf); appendStringInfo(&buf, "array_in- ndim %d (", ndim); - for (int i = 0; i < ndim; i++) + for (int i = 0; i < MAXDIM; i++) appendStringInfo(&buf, " %d", dim[i]); + appendStringInfo(&buf, "lBound info"); + for (int i = 0; i < MAXDIM; i++) + appendStringInfo(&buf, " %d", lBound[i]); appendStringInfo(&buf, ") for %s\n", string); elog(NOTICE, "%s", buf.data); pfree(buf.data); } #endif - /* This checks for overflow of the array dimensions */ - - /* - * FIXME: Is this still required? I believe all the checks it performs are - * redundant with other checks in ReadArrayDimension() and ReadArrayStr() - */ - nitems_according_to_dims = ArrayGetNItemsSafe(ndim, dim, escontext); - if (nitems_according_to_dims < 0) - PG_RETURN_NULL(); - if (nitems != nitems_according_to_dims) - elog(ERROR, "mismatch nitems, %d vs %d", nitems, nitems_according_to_dims); - if (!ArrayCheckBoundsSafe(ndim, dim, lBound, escontext)) - PG_RETURN_NULL(); - /* Empty array? */ if (nitems == 0) PG_RETURN_ARRAYTYPE_P(construct_empty_array(element_type)); @@ -675,10 +666,30 @@ ReadArrayStr(char **srcptr, { /* Nested sub-arrays count as elements of outer level */ nelems[nest_level - 1]++; + + if (nitems > 0 && expect_delim == false) + { + ereturn(escontext, false, + (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), + errmsg("malformed array literal: \"%s\"", origStr), + errdetail("Unexpected \"%c\" character.", + typdelim))); + } expect_delim = true; } else + { + /* rightmost should precede with element or bracket */ + if (nitems > 0 && expect_delim == false) + { + ereturn(escontext, false, + (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), + errmsg("malformed array literal: \"%s\"", origStr), + errdetail("Unexpected \"%c\" character.", + typdelim))); + } expect_delim = false; + } if (dim[nest_level] < 0) { diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out index 93e11068..122f073e 100644 --- a/src/test/regress/expected/arrays.out +++ b/src/test/regress/expected/arrays.out @@ -1520,7 +1520,7 @@ select '{{1},{}}'::text[]; ERROR: malformed array literal: "{{1},{}}" LINE 1: select '{{1},{}}'::text[]; ^ -DETAIL: Multidimensional arrays must have sub-arrays with matching dimensions. +DETAIL: Unexpected "," character. select '{{},{1}}'::text[]; ERROR: malformed array literal: "{{},{1}}" LINE 1: select '{{},{1}}'::text[]; @@ -1544,6 +1544,34 @@ ERROR: cannot determine type of empty array LINE 1: select array[]; ^ HINT: Explicitly cast to the desired type, for example ARRAY[]::integer[]. +select '{{1,},{1},}'::text[]; +ERROR: malformed array literal: "{{1,},{1},}" +LINE 1: select '{{1,},{1},}'::text[]; + ^ +DETAIL: Unexpected "," character. +select '{{1,},{1}}'::text[]; +ERROR: malformed array literal: "{{1,},{1}}" +LINE 1: select '{{1,},{1}}'::text[]; + ^ +DETAIL: Unexpected "," character. +select '{{1,}}'::text[]; +ERROR: malformed array literal: "{{1,}}" +LINE 1: select '{{1,}}'::text[]; + ^ +DETAIL: Unexpected "," character. +select '{1,}'::text[]; +ERROR: malformed array literal: "{1,}" +LINE 1: select '{1,}'::text[]; + ^ +DETAIL: Unexpected "," character. +select '[21474836488:21474836489]={1,2}'::int[]; +ERROR: array bound is out of range +LINE 1: select '[21474836488:21474836489]={1,2}'::int[]; + ^ +select '[-2147483649:-2147483648]={1,2}'::int[]; +ERROR: array bound is out of range +LINE 1: select '[-2147483649:-2147483648]={1,2}'::int[]; + ^ -- none of the above should be accepted -- all of the following should be accepted select '{}'::text[]; @@ -1615,6 +1643,12 @@ select '[1:0]={}'::int[]; {} (1 row) +select '[-2147483648:-2147483647]={1,2}'::int[]; + int4 +--------------------------------- + [-2147483648:-2147483647]={1,2} +(1 row) + -- all of the above should be accepted -- tests for array aggregates CREATE TEMP TABLE arraggtest ( f1 INT[], f2 TEXT[][], f3 FLOAT[]); diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql index b7e2b180..6bf18b7d 100644 --- a/src/test/regress/sql/arrays.sql +++ b/src/test/regress/sql/arrays.sql @@ -468,6 +468,13 @@ select '[2147483646:2147483647]={1,2}'::int[]; select '[1:-1]={}'::int[]; select '[1:0]={1}'::int[]; select array[]; +select '{{1,},{1},}'::text[]; +select '{{1,},{1}}'::text[]; +select '{{1,}}'::text[]; +select '{1,}'::text[]; +select '[21474836488:21474836489]={1,2}'::int[]; +select '[-2147483649:-2147483648]={1,2}'::int[]; + -- none of the above should be accepted -- all of the following should be accepted @@ -485,6 +492,7 @@ select array[]::text[]; select '[0:1]={1.1,2.2}'::float8[]; select '[2147483646:2147483646]={1}'::int[]; select '[1:0]={}'::int[]; +select '[-2147483648:-2147483647]={1,2}'::int[]; -- all of the above should be accepted -- tests for array aggregates -- 2.34.1