Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e2f1765

Browse files
committed
Remove xmlparse(document '') test
This one test was behaving differently between the ubuntu fix for CVE-2015-7499 and the base "expected" file. It's not worth having yet another version of the expected file for this test, so drop it. Perhaps at some point when all distros have settled down to the same 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 parent 7b96bf4 commit e2f1765

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

src/test/regress/expected/xml.out

-11
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');
263263
<nosuchprefix:tag/>
264264
(1 row)
265265

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-
^
277266
SELECT xmlparse(document ' ');
278267
ERROR: invalid XML document
279268
DETAIL: line 1: Start tag expected, '<' not found

src/test/regress/expected/xml_1.out

-4
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');
204204
ERROR: unsupported XML feature
205205
DETAIL: This functionality requires the server to be built with libxml support.
206206
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.
211207
SELECT xmlparse(document ' ');
212208
ERROR: unsupported XML feature
213209
DETAIL: This functionality requires the server to be built with libxml support.

src/test/regress/expected/xml_2.out

-4
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,6 @@ SELECT xmlparse(content '<nosuchprefix:tag/>');
251251
<nosuchprefix:tag/>
252252
(1 row)
253253

254-
SELECT xmlparse(document '');
255-
ERROR: invalid XML document
256-
DETAIL: line 1: switching encoding : no input
257-
line 1: Document is empty
258254
SELECT xmlparse(document ' ');
259255
ERROR: invalid XML document
260256
DETAIL: line 1: Start tag expected, '<' not found

src/test/regress/sql/xml.sql

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ SELECT xmlparse(content '<relativens xmlns=''relative''/>');
7171
SELECT xmlparse(content '<twoerrors>&idontexist;</unbalanced>');
7272
SELECT xmlparse(content '<nosuchprefix:tag/>');
7373

74-
SELECT xmlparse(document '');
7574
SELECT xmlparse(document ' ');
7675
SELECT xmlparse(document 'abc');
7776
SELECT xmlparse(document '<abc>x</abc>');

0 commit comments

Comments
 (0)