Commit a617e24f authored by Daniel Veillard's avatar Daniel Veillard
Browse files

reverted first patches for #319279 which led to #326295 and fixed the

* parser.c: reverted first patches for #319279 which led to #326295
  and fixed the problem in xmlParseChunk() instead
* test/ent11 result//ent11*: added test for #326295 to the regression
  suite
Daniel
parent 67952601
Mon Jan 9 15:33:16 CET 2006 Daniel Veillard <daniel@veillard.com>
* parser.c: reverted first patches for #319279 which led to #326295
and fixed the problem in xmlParseChunk() instead
* test/ent11 result//ent11*: added test for #326295 to the regression
suite
Thu Jan 5 16:25:06 CET 2006 Daniel Veillard <daniel@veillard.com>
 
* NEWS configure.in libxml.spec.in testapi.c doc/*: upated the news
......
......@@ -3539,16 +3539,12 @@ get_more:
ctxt->input->cur = in;
if (*in == 0xD) {
in++;
if (!*in) /* if end of current chunk return */
return;
if (*in == 0xA) {
ctxt->input->cur = in;
in++;
ctxt->input->line++; ctxt->input->col = 1;
continue; /* while */
}
if (!*in) /* if end of current chunk return */
return;
in--;
}
if (*in == '<') {
......@@ -3931,8 +3927,6 @@ get_more:
ctxt->input->line++; ctxt->input->col = 1;
continue; /* while */
}
if (!*in) /* if end of current chunk return */
return;
in--;
}
SHRINK;
......@@ -10407,12 +10401,19 @@ encoding_error:
int
xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
int terminate) {
int end_in_lf = 0;
if (ctxt == NULL)
return(XML_ERR_INTERNAL_ERROR);
if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
return(ctxt->errNo);
if (ctxt->instate == XML_PARSER_START)
xmlDetectSAX2(ctxt);
if ((size > 0) && (chunk != NULL) && (!terminate) &&
(chunk[size - 1] == '\r')) {
end_in_lf = 1;
size--;
}
if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
(ctxt->input->buf != NULL) && (ctxt->instate != XML_PARSER_EOF)) {
int base = ctxt->input->base - ctxt->input->buf->buffer->content;
......@@ -10451,6 +10452,10 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
}
}
xmlParseTryOrFinish(ctxt, terminate);
if ((end_in_lf == 1) && (ctxt->input != NULL) &&
(ctxt->input->buf != NULL)) {
xmlParserInputBufferPush(ctxt->input->buf, 1, "\r");
}
if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1))
return(ctxt->errNo);
if (terminate) {
......
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE doc [
<!ENTITY newl "&#13;">
]>
<doc>&newl;</doc>
0 10 doc 0 0
0 1 doc 0 0
1 14 #text 0 1
0 15 doc 0 0
0 10 doc 0 0
0 1 doc 0 0
1 5 newl 0 0
0 15 doc 0 0
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(doc, , )
SAX.entityDecl(newl, 1, (null), (null), )
SAX.getEntity(newl)
SAX.externalSubset(doc, , )
SAX.startElement(doc)
SAX.getEntity(newl)
SAX.characters(
, 1)
SAX.reference(newl)
SAX.endElement(doc)
SAX.endDocument()
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(doc, , )
SAX.entityDecl(newl, 1, (null), (null), )
SAX.getEntity(newl)
SAX.externalSubset(doc, , )
SAX.startElementNs(doc, NULL, NULL, 0, 0, 0)
SAX.getEntity(newl)
SAX.characters(
, 1)
SAX.reference(newl)
SAX.endElementNs(doc, NULL, NULL)
SAX.endDocument()
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE doc [
<!ENTITY newl "&#13;">
]>
<doc>
</doc>
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE doc [
<!ENTITY newl "&#13;">
]>
<doc>&newl;</doc>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment