Skip to content

Fix crash in age_to*list functions called with non-agtype argument #2609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ritojoao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash in age_to*list functions called with non-agtype argument #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions regress/expected/expr.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10708,6 +10708,30 @@ NOTICE: graph "issue_2391" has been dropped

(1 row)

--
-- Issue 2563: age_to*list called from SQL with a non-agtype literal
-- must raise an error instead of crashing
--
SELECT ag_catalog.age_tobooleanlist('[true]');
ERROR: toBooleanList() argument must be of type agtype
SELECT ag_catalog.age_tofloatlist('[1.5]');
ERROR: toFloatList() argument must be of type agtype
SELECT ag_catalog.age_tointegerlist('[1]');
ERROR: toIntegerList() argument must be of type agtype
SELECT ag_catalog.age_tostringlist('[1]');
ERROR: toStringList() argument must be of type agtype
SELECT ag_catalog.age_tobooleanlist('[true]'::agtype);
age_tobooleanlist
-------------------
[true]
(1 row)

SELECT ag_catalog.age_tostringlist('[1]'::agtype);
age_tostringlist
------------------
["1"]
(1 row)

--
-- End of tests
--
11 changes: 11 additions & 0 deletions regress/sql/expr.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4200,6 +4200,17 @@ SELECT * FROM cypher('issue_2391', $$
$$) AS (n agtype);
SELECT * FROM drop_graph('issue_2391', true);

--
-- Issue 2563: age_to*list called from SQL with a non-agtype literal
-- must raise an error instead of crashing
--
SELECT ag_catalog.age_tobooleanlist('[true]');
SELECT ag_catalog.age_tofloatlist('[1.5]');
SELECT ag_catalog.age_tointegerlist('[1]');
SELECT ag_catalog.age_tostringlist('[1]');
SELECT ag_catalog.age_tobooleanlist('[true]'::agtype);
SELECT ag_catalog.age_tostringlist('[1]'::agtype);

--
-- End of tests
--
20 changes: 20 additions & 0 deletions src/backend/utils/adt/agtype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6864,6 +6864,11 @@ Datum age_tobooleanlist(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(0))
PG_RETURN_NULL();

/* the argument must be agtype, otherwise it cannot be read as one */
if (get_fn_expr_argtype(fcinfo->flinfo, 0) != AGTYPEOID)
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("toBooleanList() argument must be of type agtype")));

agt_arg = AG_GET_ARG_AGTYPE_P(0);
/* check for an array */
if (!AGT_ROOT_IS_ARRAY(agt_arg) || AGT_ROOT_IS_SCALAR(agt_arg))
Expand Down Expand Up @@ -7105,6 +7110,11 @@ Datum age_tofloatlist(PG_FUNCTION_ARGS)
{
PG_RETURN_NULL();
}
/* the argument must be agtype, otherwise it cannot be read as one */
if (get_fn_expr_argtype(fcinfo->flinfo, 0) != AGTYPEOID)
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("toFloatList() argument must be of type agtype")));

agt_arg = AG_GET_ARG_AGTYPE_P(0);

/* check for an array */
Expand Down Expand Up @@ -7462,6 +7472,11 @@ Datum age_tointegerlist(PG_FUNCTION_ARGS)
{
PG_RETURN_NULL();
}
/* the argument must be agtype, otherwise it cannot be read as one */
if (get_fn_expr_argtype(fcinfo->flinfo, 0) != AGTYPEOID)
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("toIntegerList() argument must be of type agtype")));

agt_arg = AG_GET_ARG_AGTYPE_P(0);
/* check for an array */
if (!AGT_ROOT_IS_ARRAY(agt_arg) || AGT_ROOT_IS_SCALAR(agt_arg))
Expand Down Expand Up @@ -8102,6 +8117,11 @@ Datum age_tostringlist(PG_FUNCTION_ARGS)
{
PG_RETURN_NULL();
}
/* the argument must be agtype, otherwise it cannot be read as one */
if (get_fn_expr_argtype(fcinfo->flinfo, 0) != AGTYPEOID)
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("toStringList() argument must be of type agtype")));

agt_arg = AG_GET_ARG_AGTYPE_P(0);
/* check for an array */
if (!AGT_ROOT_IS_ARRAY(agt_arg) || AGT_ROOT_IS_SCALAR(agt_arg))
Expand Down