Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaaf15e5

Browse files
committed
Ensure that xpath() escapes special characters in string values.
Without this it's possible for the output to not be legal XML, asillustrated by the added regression test cases.NB: this change will need to be called out as an incompatibility in the9.2 release notes, since it's possible somebody was relying on the oldbehavior, even though it's clearly wrong.Florian Pflug, reviewed by Radoslaw Smogura
1 parent17a16ee commitaaf15e5

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

‎src/backend/utils/adt/xml.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3537,7 +3537,11 @@ xml_xmlnodetoxmltype(xmlNodePtr cur)
35373537
str=xmlXPathCastNodeToString(cur);
35383538
PG_TRY();
35393539
{
3540-
result= (xmltype*)cstring_to_text((char*)str);
3540+
/* Here we rely on XML having the same representation as TEXT */
3541+
char*escaped=escape_xml((char*)str);
3542+
3543+
result= (xmltype*)cstring_to_text(escaped);
3544+
pfree(escaped);
35413545
}
35423546
PG_CATCH();
35433547
{

‎src/test/regress/expected/xml.out

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,18 @@ SELECT xpath('//b', '<a>one <b>two</b> three <b>etc</b></a>');
589589
{<b>two</b>,<b>etc</b>}
590590
(1 row)
591591

592+
SELECT xpath('//text()', '<root>&lt;</root>');
593+
xpath
594+
--------
595+
{&lt;}
596+
(1 row)
597+
598+
SELECT xpath('//@value', '<root value="&lt;"/>');
599+
xpath
600+
--------
601+
{&lt;}
602+
(1 row)
603+
592604
-- Test xmlexists and xpath_exists
593605
SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
594606
xmlexists

‎src/test/regress/expected/xml_1.out

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,18 @@ LINE 1: SELECT xpath('//b', '<a>one <b>two</b> three <b>etc</b></a>'...
504504
^
505505
DETAIL: This functionality requires the server to be built with libxml support.
506506
HINT: You need to rebuild PostgreSQL using --with-libxml.
507+
SELECT xpath('//text()', '<root>&lt;</root>');
508+
ERROR: unsupported XML feature
509+
LINE 1: SELECT xpath('//text()', '<root>&lt;</root>');
510+
^
511+
DETAIL: This functionality requires the server to be built with libxml support.
512+
HINT: You need to rebuild PostgreSQL using --with-libxml.
513+
SELECT xpath('//@value', '<root value="&lt;"/>');
514+
ERROR: unsupported XML feature
515+
LINE 1: SELECT xpath('//@value', '<root value="&lt;"/>');
516+
^
517+
DETAIL: This functionality requires the server to be built with libxml support.
518+
HINT: You need to rebuild PostgreSQL using --with-libxml.
507519
-- Test xmlexists and xpath_exists
508520
SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
509521
ERROR: unsupported XML feature

‎src/test/regress/sql/xml.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ SELECT xpath('', '<!-- error -->');
175175
SELECT xpath('//text()','<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>');
176176
SELECT xpath('//loc:piece/@id','<local:data xmlns:local="http://127.0.0.1"><local:piece id="1">number one</local:piece><local:piece id="2" /></local:data>', ARRAY[ARRAY['loc','http://127.0.0.1']]);
177177
SELECT xpath('//b','<a>one <b>two</b> three <b>etc</b></a>');
178+
SELECT xpath('//text()','<root>&lt;</root>');
179+
SELECT xpath('//@value','<root value="&lt;"/>');
178180

179181
-- Test xmlexists and xpath_exists
180182
SELECT xmlexists('//town[text() =''Toronto'']' PASSING BY REF'<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp