mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-07-30 22:43:14 +03:00
- parser.c SAX.c: the new content parsing code raised an
ugly bug in the characters() SAX callback. Found it just because of strangeness in XSLT XML Rec ouptut :-( Daniel
This commit is contained in:
25
parser.c
25
parser.c
@ -2450,15 +2450,17 @@ xmlParseCharData(xmlParserCtxtPtr ctxt, int cdata) {
|
||||
continue; /* while */
|
||||
}
|
||||
nbchar = in - ctxt->input->cur;
|
||||
if (IS_BLANK(*ctxt->input->cur) &&
|
||||
areBlanks(ctxt, ctxt->input->cur, nbchar)) {
|
||||
if (ctxt->sax->ignorableWhitespace != NULL)
|
||||
ctxt->sax->ignorableWhitespace(ctxt->userData,
|
||||
ctxt->input->cur, nbchar);
|
||||
} else {
|
||||
if (ctxt->sax->characters != NULL)
|
||||
ctxt->sax->characters(ctxt->userData,
|
||||
ctxt->input->cur, nbchar);
|
||||
if (nbchar > 0) {
|
||||
if (IS_BLANK(*ctxt->input->cur) &&
|
||||
areBlanks(ctxt, ctxt->input->cur, nbchar)) {
|
||||
if (ctxt->sax->ignorableWhitespace != NULL)
|
||||
ctxt->sax->ignorableWhitespace(ctxt->userData,
|
||||
ctxt->input->cur, nbchar);
|
||||
} else {
|
||||
if (ctxt->sax->characters != NULL)
|
||||
ctxt->sax->characters(ctxt->userData,
|
||||
ctxt->input->cur, nbchar);
|
||||
}
|
||||
}
|
||||
ctxt->input->cur = in;
|
||||
if (*in == 0xD) {
|
||||
@ -2471,7 +2473,10 @@ xmlParseCharData(xmlParserCtxtPtr ctxt, int cdata) {
|
||||
}
|
||||
in--;
|
||||
}
|
||||
if ((*in == '<') || (*in == '&')) {
|
||||
if (*in == '<') {
|
||||
return;
|
||||
}
|
||||
if (*in == '&') {
|
||||
return;
|
||||
}
|
||||
SHRINK;
|
||||
|
Reference in New Issue
Block a user