mirror of
https://github.com/postgres/postgres.git
synced 2025-05-31 03:21:24 +03:00
Avoid failure when selecting a namespace node in XMLTABLE.
It appears that libxml2 doesn't bother to set the "children" field of an XML_NAMESPACE_DECL node to null; that field just contains garbage. In v10 and v11, this can result in a crash in XMLTABLE(). The rewrite done in commit 251cf2e27 fixed this, somewhat accidentally, in v12. We're not going to back-patch 251cf2e27, however. The case apparently doesn't have wide use, so rather than risk introducing other problems, just add a safety check to throw an error. Even though no bug manifests in v12/HEAD, add the relevant test case there too, to prevent future regressions. Chapman Flack (per private report)
This commit is contained in:
parent
84d1c5c45f
commit
9bf2476866
@ -4608,6 +4608,12 @@ XmlTableGetValue(TableFuncScanState *state, int colnum,
|
|||||||
xmlChar *str;
|
xmlChar *str;
|
||||||
xmlNodePtr node;
|
xmlNodePtr node;
|
||||||
|
|
||||||
|
node = xpathobj->nodesetval->nodeTab[0];
|
||||||
|
if (node->type == XML_NAMESPACE_DECL)
|
||||||
|
ereport(ERROR,
|
||||||
|
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||||
|
errmsg("XMLTABLE cannot cast a namespace node to a non-XML result type")));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Most nodes (elements and even attributes) store their data
|
* Most nodes (elements and even attributes) store their data
|
||||||
* in children nodes. If they don't have children nodes, it
|
* in children nodes. If they don't have children nodes, it
|
||||||
@ -4615,7 +4621,6 @@ XmlTableGetValue(TableFuncScanState *state, int colnum,
|
|||||||
* CDATA sections are an exception: they don't have children
|
* CDATA sections are an exception: they don't have children
|
||||||
* but have content in the Text/CDATA node itself.
|
* but have content in the Text/CDATA node itself.
|
||||||
*/
|
*/
|
||||||
node = xpathobj->nodesetval->nodeTab[0];
|
|
||||||
if (node->type != XML_CDATA_SECTION_NODE &&
|
if (node->type != XML_CDATA_SECTION_NODE &&
|
||||||
node->type != XML_TEXT_NODE)
|
node->type != XML_TEXT_NODE)
|
||||||
node = node->xmlChildrenNode;
|
node = node->xmlChildrenNode;
|
||||||
|
@ -1167,6 +1167,10 @@ SELECT * FROM XMLTABLE(XMLNAMESPACES(DEFAULT 'http://x.y'),
|
|||||||
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
||||||
COLUMNS a int PATH 'a');
|
COLUMNS a int PATH 'a');
|
||||||
ERROR: DEFAULT namespace is not supported
|
ERROR: DEFAULT namespace is not supported
|
||||||
|
SELECT * FROM XMLTABLE('/'
|
||||||
|
PASSING '<foo/>'
|
||||||
|
COLUMNS a text PATH 'foo/namespace::node()');
|
||||||
|
ERROR: XMLTABLE cannot cast a namespace node to a non-XML result type
|
||||||
-- used in prepare statements
|
-- used in prepare statements
|
||||||
PREPARE pp AS
|
PREPARE pp AS
|
||||||
SELECT xmltable.*
|
SELECT xmltable.*
|
||||||
|
@ -1042,6 +1042,14 @@ LINE 3: PASSING '<rows xmlns="http://x.y"><row...
|
|||||||
^
|
^
|
||||||
DETAIL: This functionality requires the server to be built with libxml support.
|
DETAIL: This functionality requires the server to be built with libxml support.
|
||||||
HINT: You need to rebuild PostgreSQL using --with-libxml.
|
HINT: You need to rebuild PostgreSQL using --with-libxml.
|
||||||
|
SELECT * FROM XMLTABLE('/'
|
||||||
|
PASSING '<foo/>'
|
||||||
|
COLUMNS a text PATH 'foo/namespace::node()');
|
||||||
|
ERROR: unsupported XML feature
|
||||||
|
LINE 2: PASSING '<foo/>'
|
||||||
|
^
|
||||||
|
DETAIL: This functionality requires the server to be built with libxml support.
|
||||||
|
HINT: You need to rebuild PostgreSQL using --with-libxml.
|
||||||
-- used in prepare statements
|
-- used in prepare statements
|
||||||
PREPARE pp AS
|
PREPARE pp AS
|
||||||
SELECT xmltable.*
|
SELECT xmltable.*
|
||||||
|
@ -1147,6 +1147,10 @@ SELECT * FROM XMLTABLE(XMLNAMESPACES(DEFAULT 'http://x.y'),
|
|||||||
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
||||||
COLUMNS a int PATH 'a');
|
COLUMNS a int PATH 'a');
|
||||||
ERROR: DEFAULT namespace is not supported
|
ERROR: DEFAULT namespace is not supported
|
||||||
|
SELECT * FROM XMLTABLE('/'
|
||||||
|
PASSING '<foo/>'
|
||||||
|
COLUMNS a text PATH 'foo/namespace::node()');
|
||||||
|
ERROR: XMLTABLE cannot cast a namespace node to a non-XML result type
|
||||||
-- used in prepare statements
|
-- used in prepare statements
|
||||||
PREPARE pp AS
|
PREPARE pp AS
|
||||||
SELECT xmltable.*
|
SELECT xmltable.*
|
||||||
|
@ -401,6 +401,10 @@ SELECT * FROM XMLTABLE(XMLNAMESPACES(DEFAULT 'http://x.y'),
|
|||||||
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
PASSING '<rows xmlns="http://x.y"><row><a>10</a></row></rows>'
|
||||||
COLUMNS a int PATH 'a');
|
COLUMNS a int PATH 'a');
|
||||||
|
|
||||||
|
SELECT * FROM XMLTABLE('/'
|
||||||
|
PASSING '<foo/>'
|
||||||
|
COLUMNS a text PATH 'foo/namespace::node()');
|
||||||
|
|
||||||
-- used in prepare statements
|
-- used in prepare statements
|
||||||
PREPARE pp AS
|
PREPARE pp AS
|
||||||
SELECT xmltable.*
|
SELECT xmltable.*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user