c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of empty CDATA nodes as reported and discussed around #514181

Browse Source 
* xmlsave.c parser.c: fix handling of empty CDATA nodes as 
  reported and discussed around #514181 and associated patches
* test/emptycdata.xml result/emptycdata.xml* 
  result/noent/emptycdata.xml: added a specific test in the
  regression suite.
Daniel

svn path=/trunk/; revision=3701
This commit is contained in:
Daniel Veillard 2008-03-07 16:50:21 +00:00
parent 57c9db0725
commit d0d2f090dc
10 changed files with 88 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Mar 7 17:45:27 CET 2008 Daniel Veillard <daniel@veillard.com>
* xmlsave.c parser.c: fix handling of empty CDATA nodes as
reported and discussed around #514181 and associated patches
* test/emptycdata.xml result/emptycdata.xml*
result/noent/emptycdata.xml: added a specific test in the
regression suite.
Thu Mar 6 15:23:10 CET 2008 Daniel Veillard <daniel@veillard.com>
* encoding.c: poblem with encoding detection for UTF-16 reported by

15
parser.c
View File

@ -10165,7 +10165,20 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
ctxt->input->cur += tmp;
goto encoding_error;
}
if ((ctxt->sax != NULL) && (base > 0) &&
if ((ctxt->sax != NULL) && (base == 0) &&
(ctxt->sax->cdataBlock != NULL) &&
(!ctxt->disableSAX)) {
/*
* Special case to provide identical behaviour
* between pull and push parsers on enpty CDATA
* sections
*/
if ((ctxt->input->cur - ctxt->input->base >= 9) &&
(!strncmp((const char *)&ctxt->input->cur[-9],
"<![CDATA[", 9)))
ctxt->sax->cdataBlock(ctxt->userData,
BAD_CAST "", 0);
} else if ((ctxt->sax != NULL) && (base > 0) &&
(!ctxt->disableSAX)) {
if (ctxt->sax->cdataBlock != NULL)
ctxt->sax->cdataBlock(ctxt->userData,

4
result/emptycdata.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<![CDATA[]]>
</html>

7
result/emptycdata.xml.rde Normal file
View File

@ -0,0 +1,7 @@
0 1 html 0 0
1 14 #text 0 1
1 4 #cdata-section 0 1
1 14 #text 0 1
0 15 html 0 0

7
result/emptycdata.xml.rdr Normal file
View File

@ -0,0 +1,7 @@
0 1 html 0 0
1 14 #text 0 1
1 4 #cdata-section 0 1
1 14 #text 0 1
0 15 html 0 0

10
result/emptycdata.xml.sax Normal file
View File

@ -0,0 +1,10 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.startElement(html, xmlns='http://www.w3.org/1999/xhtml')
SAX.characters(
, 1)
SAX.pcdata(, 0)
SAX.characters(
, 1)
SAX.endElement(html)
SAX.endDocument()

10
result/emptycdata.xml.sax2 Normal file
View File

@ -0,0 +1,10 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.startElementNs(html, NULL, 'http://www.w3.org/1999/xhtml', 1, xmlns='http://www.w3.org/1999/xhtml', 0, 0)
SAX.characters(
, 1)
SAX.pcdata(, 0)
SAX.characters(
, 1)
SAX.endElementNs(html, NULL, 'http://www.w3.org/1999/xhtml')
SAX.endDocument()

4
result/noent/emptycdata.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<![CDATA[]]>
</html>

4
test/emptycdata.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<![CDATA[]]>
</html>

36
xmlsave.c
View File

@ -727,8 +727,8 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
return;
}
if (cur->type == XML_CDATA_SECTION_NODE) {
if (cur->content == NULL) {
xmlOutputBufferWrite(buf, 12, "<![CDATA[]]>");
if (cur->content == NULL || *cur->content == '\0') {
xmlOutputBufferWrite(buf, 12, "<![CDATA[]]>");
} else {
start = end = cur->content;
while (*end != '\0') {
@ -1236,21 +1236,25 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
return;
}
if (cur->type == XML_CDATA_SECTION_NODE) {
start = end = cur->content;
while (*end != '\0') {
if (*end == ']' && *(end + 1) == ']' && *(end + 2) == '>') {
end = end + 2;
xmlOutputBufferWrite(buf, 9, "<![CDATA[");
xmlOutputBufferWrite(buf, end - start, (const char *)start);
xmlOutputBufferWrite(buf, 3, "]]>");
start = end;
if (cur->content == NULL || *cur->content == '\0') {
xmlOutputBufferWrite(buf, 12, "<![CDATA[]]>");
} else {
start = end = cur->content;
while (*end != '\0') {
if (*end == ']' && *(end + 1) == ']' && *(end + 2) == '>') {
end = end + 2;
xmlOutputBufferWrite(buf, 9, "<![CDATA[");
xmlOutputBufferWrite(buf, end - start, (const char *)start);
xmlOutputBufferWrite(buf, 3, "]]>");
start = end;
}
end++;
}
if (start != end) {
xmlOutputBufferWrite(buf, 9, "<![CDATA[");
xmlOutputBufferWriteString(buf, (const char *)start);
xmlOutputBufferWrite(buf, 3, "]]>");
}
end++;
}
if (start != end) {
xmlOutputBufferWrite(buf, 9, "<![CDATA[");
xmlOutputBufferWriteString(buf, (const char *)start);
xmlOutputBufferWrite(buf, 3, "]]>");
}
return;
}