NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc6eced0

committed

Remove xmlparse(document '') test

This one test was behaving differently between the ubuntu fix forCVE-2015-7499 and the base "expected" file. It's not worth havingyet another version of the expected file for this test, so drop it.Perhaps at some point when all distros have settled down to thesame behavior on this test, it can be restored.Problem found by me on libxml2 (2.9.1+dfsg1-3ubuntu4.6).Solution suggested by Tom Lane.Backpatch to 9.5, where the test was added.

1 parent34d136f commitc6eced0Copy full SHA for c6eced0

File tree

4 files changed

-20

lines changed

src/test/regress
- expected
- sql
  - xml.sql

4 files changed

-20

lines changed

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

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -263,17 +263,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');`
`263`	`263`	`<nosuchprefix:tag/>`
`264`	`264`	`(1 row)`
`265`	`265`
`266`		`-SELECT xmlparse(document '');`
`267`		`-ERROR: invalid XML document`
`268`		`-DETAIL: line 1: switching encoding : no input`
`269`		`-`
`270`		`-^`
`271`		`-line 1: Document is empty`
`272`		`-`
`273`		`-^`
`274`		`-line 1: Start tag expected, '<' not found`
`275`		`-`
`276`		`-^`
`277`	`266`	`SELECT xmlparse(document ' ');`
`278`	`267`	`ERROR: invalid XML document`
`279`	`268`	`DETAIL: line 1: Start tag expected, '<' not found`

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

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,10 +204,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');`
`204`	`204`	`ERROR: unsupported XML feature`
`205`	`205`	`DETAIL: This functionality requires the server to be built with libxml support.`
`206`	`206`	`HINT: You need to rebuild PostgreSQL using --with-libxml.`
`207`		`-SELECT xmlparse(document '');`
`208`		`-ERROR: unsupported XML feature`
`209`		`-DETAIL: This functionality requires the server to be built with libxml support.`
`210`		`-HINT: You need to rebuild PostgreSQL using --with-libxml.`
`211`	`207`	`SELECT xmlparse(document ' ');`
`212`	`208`	`ERROR: unsupported XML feature`
`213`	`209`	`DETAIL: This functionality requires the server to be built with libxml support.`

`‎src/test/regress/expected/xml_2.out`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');`
`251`	`251`	`<nosuchprefix:tag/>`
`252`	`252`	`(1 row)`
`253`	`253`
`254`		`-SELECT xmlparse(document '');`
`255`		`-ERROR: invalid XML document`
`256`		`-DETAIL: line 1: switching encoding : no input`
`257`		`-line 1: Document is empty`
`258`	`254`	`SELECT xmlparse(document ' ');`
`259`	`255`	`ERROR: invalid XML document`
`260`	`256`	`DETAIL: line 1: Start tag expected, '<' not found`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ SELECT xmlparse(content '<relativens xmlns=''relative''/>');`
`71`	`71`	`SELECT xmlparse(content'<twoerrors>&idontexist;</unbalanced>');`
`72`	`72`	`SELECT xmlparse(content'<nosuchprefix:tag/>');`
`73`	`73`
`74`		`-SELECT xmlparse(document'');`
`75`	`74`	`SELECT xmlparse(document'');`
`76`	`75`	`SELECT xmlparse(document'abc');`
`77`	`76`	`SELECT xmlparse(document'<abc>x</abc>');`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc6eced0

File tree

4 files changed

4 files changed

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

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

`‎src/test/regress/expected/xml_2.out`

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

0 commit comments