mirror of
https://github.com/postgres/postgres.git
synced 2025-05-19 00:04:06 -04:00
Fix Assert failure in XMLTABLE parser
In an XMLTABLE expression, columns can be marked NOT NULL, and the parser internally fabricates an option named "is_not_null" to represent this. However, the parser also allows users to specify arbitrary option names. This creates a conflict: a user can explicitly use "is_not_null" as an option name and assign it a non-Boolean value, which violates internal assumptions and triggers an assertion failure. To fix, this patch checks whether a user-supplied name collides with the internally reserved option name and raises an error if so. Additionally, the internal name is renamed to "__pg__is_not_null" to further reduce the risk of collision with user-defined names. Reported-by: Евгений Горбанев <gorbanyoves@basealt.ru> Author: Richard Guo <guofenglinux@gmail.com> Reviewed-by: Alvaro Herrera <alvherre@kurilemu.de> Discussion: https://postgr.es/m/6bac9886-65bf-4cec-96bd-e304159f28db@basealt.ru Backpatch-through: 15
This commit is contained in:
parent
9c94d983d6
commit
d3716d4b13
@ -13838,7 +13838,7 @@ xmltable_column_el:
|
|||||||
parser_errposition(defel->location)));
|
parser_errposition(defel->location)));
|
||||||
fc->colexpr = defel->arg;
|
fc->colexpr = defel->arg;
|
||||||
}
|
}
|
||||||
else if (strcmp(defel->defname, "is_not_null") == 0)
|
else if (strcmp(defel->defname, "__pg__is_not_null") == 0)
|
||||||
{
|
{
|
||||||
if (nullability_seen)
|
if (nullability_seen)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
@ -13881,13 +13881,20 @@ xmltable_column_option_list:
|
|||||||
|
|
||||||
xmltable_column_option_el:
|
xmltable_column_option_el:
|
||||||
IDENT b_expr
|
IDENT b_expr
|
||||||
{ $$ = makeDefElem($1, $2, @1); }
|
{
|
||||||
|
if (strcmp($1, "__pg__is_not_null") == 0)
|
||||||
|
ereport(ERROR,
|
||||||
|
(errcode(ERRCODE_SYNTAX_ERROR),
|
||||||
|
errmsg("option name \"%s\" cannot be used in XMLTABLE", $1),
|
||||||
|
parser_errposition(@1)));
|
||||||
|
$$ = makeDefElem($1, $2, @1);
|
||||||
|
}
|
||||||
| DEFAULT b_expr
|
| DEFAULT b_expr
|
||||||
{ $$ = makeDefElem("default", $2, @1); }
|
{ $$ = makeDefElem("default", $2, @1); }
|
||||||
| NOT NULL_P
|
| NOT NULL_P
|
||||||
{ $$ = makeDefElem("is_not_null", (Node *) makeBoolean(true), @1); }
|
{ $$ = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(true), @1); }
|
||||||
| NULL_P
|
| NULL_P
|
||||||
{ $$ = makeDefElem("is_not_null", (Node *) makeBoolean(false), @1); }
|
{ $$ = makeDefElem("__pg__is_not_null", (Node *) makeBoolean(false), @1); }
|
||||||
;
|
;
|
||||||
|
|
||||||
xml_namespace_list:
|
xml_namespace_list:
|
||||||
|
@ -1373,6 +1373,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;
|
|||||||
-- errors
|
-- errors
|
||||||
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
||||||
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
||||||
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);
|
||||||
|
ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE
|
||||||
|
LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...
|
||||||
|
^
|
||||||
-- XMLNAMESPACES tests
|
-- XMLNAMESPACES tests
|
||||||
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
||||||
'/zz:rows/zz:row'
|
'/zz:rows/zz:row'
|
||||||
|
@ -1047,6 +1047,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;
|
|||||||
-- errors
|
-- errors
|
||||||
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
||||||
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
||||||
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);
|
||||||
|
ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE
|
||||||
|
LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...
|
||||||
|
^
|
||||||
-- XMLNAMESPACES tests
|
-- XMLNAMESPACES tests
|
||||||
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
||||||
'/zz:rows/zz:row'
|
'/zz:rows/zz:row'
|
||||||
|
@ -1359,6 +1359,10 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;
|
|||||||
-- errors
|
-- errors
|
||||||
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
||||||
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
ERROR: XMLTABLE function has 1 columns available but 2 columns specified
|
||||||
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);
|
||||||
|
ERROR: option name "__pg__is_not_null" cannot be used in XMLTABLE
|
||||||
|
LINE 1: ...MLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_n...
|
||||||
|
^
|
||||||
-- XMLNAMESPACES tests
|
-- XMLNAMESPACES tests
|
||||||
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
||||||
'/zz:rows/zz:row'
|
'/zz:rows/zz:row'
|
||||||
|
@ -435,6 +435,8 @@ EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM xmltableview1;
|
|||||||
-- errors
|
-- errors
|
||||||
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp) AS f (v1, v2);
|
||||||
|
|
||||||
|
SELECT * FROM XMLTABLE (ROW () PASSING null COLUMNS v1 timestamp __pg__is_not_null 1) AS f (v1);
|
||||||
|
|
||||||
-- XMLNAMESPACES tests
|
-- XMLNAMESPACES tests
|
||||||
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
SELECT * FROM XMLTABLE(XMLNAMESPACES('http://x.y' AS zz),
|
||||||
'/zz:rows/zz:row'
|
'/zz:rows/zz:row'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user