lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

another fix for nodeinfo in entities problem fixed bug #106788 from James

Browse Source 
* parser.c: another fix for nodeinfo in entities problem
* tree.c entities.c: fixed bug #106788 from James Clark
  some spaces need to be serialized as character references.
Daniel
This commit is contained in:
Daniel Veillard
2003-02-23 13:52:30 +00:00
parent 40ed73b73d
commit 0046c0fec2
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Feb 23 14:49:39 CET 2003 Daniel Veillard <daniel@veillard.com>
* parser.c: another fix for nodeinfo in entities problem
* tree.c entities.c: fixed bug #106788 from James Clark
some spaces need to be serialized as character references.
Sat Feb 22 18:28:16 CET 2003 Igor Zlatkovic <igor@zlatkovic.com> Sat Feb 22 18:28:16 CET 2003 Igor Zlatkovic <igor@zlatkovic.com>
* parser.c uri.c: fixed the bug I introduced in the path * parser.c uri.c: fixed the bug I introduced in the path

2
entities.c
View File

@ -649,7 +649,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
*out++ = ';'; *out++ = ';';
#endif #endif
} else if (((*cur >= 0x20) && (*cur < 0x80)) || } else if (((*cur >= 0x20) && (*cur < 0x80)) ||
(*cur == '\n') || (*cur == '\r') || (*cur == '\t')) { (*cur == '\n') || (*cur == '\t') || ((html) && (*cur == '\r'))) {
/* /*
* default case, just copy ! * default case, just copy !
*/ */

3
parser.c
View File

@ -9819,6 +9819,9 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
} }
if (sax != NULL) if (sax != NULL)
ctxt->sax = oldsax; ctxt->sax = oldsax;
oldctxt->node_seq.maximum = ctxt->node_seq.maximum;
oldctxt->node_seq.length = ctxt->node_seq.length;
oldctxt->node_seq.buffer = ctxt->node_seq.buffer;
ctxt->node_seq.maximum = 0; ctxt->node_seq.maximum = 0;
ctxt->node_seq.length = 0; ctxt->node_seq.length = 0;
ctxt->node_seq.buffer = NULL; ctxt->node_seq.buffer = NULL;

12
tree.c
View File

@ -6454,6 +6454,18 @@ xmlAttrSerializeContent(xmlBufferPtr buf, xmlDocPtr doc, xmlAttrPtr attr)
xmlBufferAdd(buf, BAD_CAST "&#10;", 5); xmlBufferAdd(buf, BAD_CAST "&#10;", 5);
cur++; cur++;
base = cur; base = cur;
} else if (*cur == '\r') {
if (base != cur)
xmlBufferAdd(buf, base, cur - base);
xmlBufferAdd(buf, BAD_CAST "&#13;", 6);
cur++;
base = cur;
} else if (*cur == '\t') {
if (base != cur)
xmlBufferAdd(buf, base, cur - base);
xmlBufferAdd(buf, BAD_CAST "&#9;", 5);
cur++;
base = cur;
#if 0 #if 0
} else if (*cur == '\'') { } else if (*cur == '\'') {
if (base != cur) if (base != cur)