mirror of
https://gitlab.gnome.org/GNOME/libxml2
synced 2025-03-28 21:33:13 +00:00
fixed the comment streaming bug raised by Graham Bennett added to the
* parser.c: fixed the comment streaming bug raised by Graham Bennett * test/badcomment.xml result//badcomment.xml*: added to the regression suite. Daniel
This commit is contained in:
Daniel Veillard
parent
a81d9199c6
commit
6974feb0cf
@ -1,3 +1,9 @@
|
|||||||
|
Sun Feb 5 03:41:39 CET 2006 Daniel Veillard <daniel@veillard.com>
|
||||||
|
|
||||||
|
* parser.c: fixed the comment streaming bug raised by Graham Bennett
|
||||||
|
* test/badcomment.xml result//badcomment.xml*: added to the regression
|
||||||
|
suite.
|
||||||
|
|
||||||
Fri Feb 3 17:36:41 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
|
Fri Feb 3 17:36:41 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
|
||||||
|
|
||||||
* include/libxml/tree.h: Added the xmlDOMWrapCloneNode() to
|
* include/libxml/tree.h: Added the xmlDOMWrapCloneNode() to
|
||||||
|
|||||||
10
parser.c
10
parser.c
@ -9838,8 +9838,14 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
|
|||||||
} else if ((cur == '<') && (next == '!') &&
|
} else if ((cur == '<') && (next == '!') &&
|
||||||
(ctxt->input->cur[2] == '-') &&
|
(ctxt->input->cur[2] == '-') &&
|
||||||
(ctxt->input->cur[3] == '-')) {
|
(ctxt->input->cur[3] == '-')) {
|
||||||
if ((!terminate) &&
|
int term;
|
||||||
(xmlParseLookupSequence(ctxt, '-', '-', '>') < 0))
|
|
||||||
|
if (avail < 4)
|
||||||
|
goto done;
|
||||||
|
ctxt->input->cur += 4;
|
||||||
|
term = xmlParseLookupSequence(ctxt, '-', '-', '>');
|
||||||
|
ctxt->input->cur -= 4;
|
||||||
|
if ((!terminate) && (term < 0))
|
||||||
goto done;
|
goto done;
|
||||||
xmlParseComment(ctxt);
|
xmlParseComment(ctxt);
|
||||||
ctxt->instate = XML_PARSER_CONTENT;
|
ctxt->instate = XML_PARSER_CONTENT;
|
||||||
|
|||||||
17
result/badcomment.xml
Normal file
17
result/badcomment.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<foo>
|
||||||
|
<!-- def='NT-Char'--><!-->Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>-->
|
||||||
|
</foo>
|
||||||
21
result/badcomment.xml.rde
Normal file
21
result/badcomment.xml.rde
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
0 1 foo 0 0
|
||||||
|
1 14 #text 0 1
|
||||||
|
|
||||||
|
1 8 #comment 0 1 def='NT-Char'
|
||||||
|
1 8 #comment 0 1 >Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>
|
||||||
|
1 14 #text 0 1
|
||||||
|
|
||||||
|
0 15 foo 0 0
|
||||||
21
result/badcomment.xml.rdr
Normal file
21
result/badcomment.xml.rdr
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
0 1 foo 0 0
|
||||||
|
1 14 #text 0 1
|
||||||
|
|
||||||
|
1 8 #comment 0 1 def='NT-Char'
|
||||||
|
1 8 #comment 0 1 >Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>
|
||||||
|
1 14 #text 0 1
|
||||||
|
|
||||||
|
0 15 foo 0 0
|
||||||
24
result/badcomment.xml.sax
Normal file
24
result/badcomment.xml.sax
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
SAX.setDocumentLocator()
|
||||||
|
SAX.startDocument()
|
||||||
|
SAX.startElement(foo)
|
||||||
|
SAX.characters(
|
||||||
|
, 1)
|
||||||
|
SAX.comment( def='NT-Char')
|
||||||
|
SAX.comment(>Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>)
|
||||||
|
SAX.characters(
|
||||||
|
, 1)
|
||||||
|
SAX.endElement(foo)
|
||||||
|
SAX.endDocument()
|
||||||
24
result/badcomment.xml.sax2
Normal file
24
result/badcomment.xml.sax2
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
SAX.setDocumentLocator()
|
||||||
|
SAX.startDocument()
|
||||||
|
SAX.startElementNs(foo, NULL, NULL, 0, 0, 0)
|
||||||
|
SAX.characters(
|
||||||
|
, 1)
|
||||||
|
SAX.comment( def='NT-Char')
|
||||||
|
SAX.comment(>Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>)
|
||||||
|
SAX.characters(
|
||||||
|
, 1)
|
||||||
|
SAX.endElementNs(foo, NULL, NULL)
|
||||||
|
SAX.endDocument()
|
||||||
17
result/noent/badcomment.xml
Normal file
17
result/noent/badcomment.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<foo>
|
||||||
|
<!-- def='NT-Char'--><!-->Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>-->
|
||||||
|
</foo>
|
||||||
18
test/badcomment.xml
Normal file
18
test/badcomment.xml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<foo>
|
||||||
|
<!-- def='NT-Char'--><!-->Char</nt>* ']]>' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
']]>'</rhs>
|
||||||
|
<com>CDATA sections</com>
|
||||||
|
<rhs>| '<!DOCTYPE'
|
||||||
|
(<nt def="NT-Char">Char</nt> - ('[' | ']'))+
|
||||||
|
('['
|
||||||
|
<nt def="NT-simpleDTD">simpleDTD</nt>*
|
||||||
|
']')? '>'</rhs>
|
||||||
|
<com>doc type declaration</com>
|
||||||
|
<prod id="NT-simpleDTD"><lhs>simpleDTD</lhs>
|
||||||
|
<rhs>'<!&como;'
|
||||||
|
(<nt def='NT-Char'>Char</nt>* -
|
||||||
|
(<nt def='NT-Char'>Char</nt>* '&comc;' <nt def='NT-Char'>Char</nt>*))
|
||||||
|
'&comc;>'</rhs>-->
|
||||||
|
</foo>
|
||||||
Loading…
x
Reference in New Issue
Block a user