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

10 mn hacking while waiting for doctor appointment:

Browse Source 
- parser.c: trying to fix the Dtd parsing problem reported
  by Gary, side effect of last week speed optimizations.
Daniel
This commit is contained in:
Daniel Veillard
2001-03-05 09:49:20 +00:00
parent 14be0a178f
commit 29631a8901
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Mar 5 21:47:31 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* parser.c: trying to fix the Dtd parsing problem reported
by Gary, side effect of last week speed optimizations.
Sat Mar 3 19:45:59 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Sat Mar 3 19:45:59 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xml2Conf.sh.in: fixes pointed out by Fredrik Hallenberg * xml2Conf.sh.in: fixes pointed out by Fredrik Hallenberg

28
parser.c
View File

@ -1688,7 +1688,7 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
if (buffer == NULL) { if (buffer == NULL) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData, ctxt->sax->error(ctxt->userData,
"xmlParseName: out of memory\n"); "xmlParseNameComplex: out of memory\n");
return(NULL); return(NULL);
} }
memcpy(buffer, buf, len); memcpy(buffer, buf, len);
@ -1708,7 +1708,7 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
if (buffer == NULL) { if (buffer == NULL) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData, ctxt->sax->error(ctxt->userData,
"xmlParseName: out of memory\n"); "xmlParseNameComplex: out of memory\n");
return(NULL); return(NULL);
} }
} }
@ -1874,7 +1874,7 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) {
if (buffer == NULL) { if (buffer == NULL) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData, ctxt->sax->error(ctxt->userData,
"xmlParseName: out of memory\n"); "xmlParseNameComplex: out of memory\n");
return(NULL); return(NULL);
} }
} }
@ -3011,7 +3011,7 @@ xmlParseNotationDecl(xmlParserCtxtPtr ctxt) {
} }
SKIP_BLANKS; SKIP_BLANKS;
name = xmlParseName(ctxt); name = xmlParseNameComplex(ctxt);
if (name == NULL) { if (name == NULL) {
ctxt->errNo = XML_ERR_NOTATION_NOT_STARTED; ctxt->errNo = XML_ERR_NOTATION_NOT_STARTED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -3129,7 +3129,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
isParameter = 1; isParameter = 1;
} }
name = xmlParseName(ctxt); name = xmlParseNameComplex(ctxt);
if (name == NULL) { if (name == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -3269,7 +3269,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
ctxt->disableSAX = 1; ctxt->disableSAX = 1;
} }
SKIP_BLANKS; SKIP_BLANKS;
ndata = xmlParseName(ctxt); ndata = xmlParseNameComplex(ctxt);
if ((ctxt->sax != NULL) && (!ctxt->disableSAX) && if ((ctxt->sax != NULL) && (!ctxt->disableSAX) &&
(ctxt->sax->unparsedEntityDecl != NULL)) (ctxt->sax->unparsedEntityDecl != NULL))
ctxt->sax->unparsedEntityDecl(ctxt->userData, name, ctxt->sax->unparsedEntityDecl(ctxt->userData, name,
@ -3447,7 +3447,7 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
do { do {
NEXT; NEXT;
SKIP_BLANKS; SKIP_BLANKS;
name = xmlParseName(ctxt); name = xmlParseNameComplex(ctxt);
if (name == NULL) { if (name == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -3716,7 +3716,7 @@ xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) {
ctxt->disableSAX = 1; ctxt->disableSAX = 1;
} }
SKIP_BLANKS; SKIP_BLANKS;
elemName = xmlParseName(ctxt); elemName = xmlParseNameComplex(ctxt);
if (elemName == NULL) { if (elemName == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -3736,7 +3736,7 @@ xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) {
GROW; GROW;
tree = NULL; tree = NULL;
attrName = xmlParseName(ctxt); attrName = xmlParseNameComplex(ctxt);
if (attrName == NULL) { if (attrName == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -3919,7 +3919,7 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt) {
xmlFree(elem); xmlFree(elem);
} }
SKIP_BLANKS; SKIP_BLANKS;
elem = xmlParseName(ctxt); elem = xmlParseNameComplex(ctxt);
if (elem == NULL) { if (elem == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -4016,7 +4016,7 @@ xmlParseElementChildrenContentDecl
SKIP_BLANKS; SKIP_BLANKS;
GROW; GROW;
} else { } else {
elem = xmlParseName(ctxt); elem = xmlParseNameComplex(ctxt);
if (elem == NULL) { if (elem == NULL) {
ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_STARTED; ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_STARTED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -4159,7 +4159,7 @@ xmlParseElementChildrenContentDecl
last = xmlParseElementChildrenContentDecl(ctxt); last = xmlParseElementChildrenContentDecl(ctxt);
SKIP_BLANKS; SKIP_BLANKS;
} else { } else {
elem = xmlParseName(ctxt); elem = xmlParseNameComplex(ctxt);
if (elem == NULL) { if (elem == NULL) {
ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_STARTED; ctxt->errNo = XML_ERR_ELEMCONTENT_NOT_STARTED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -4308,7 +4308,7 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) {
ctxt->disableSAX = 1; ctxt->disableSAX = 1;
} }
SKIP_BLANKS; SKIP_BLANKS;
name = xmlParseName(ctxt); name = xmlParseNameComplex(ctxt);
if (name == NULL) { if (name == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
@ -5443,7 +5443,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) {
if (RAW == '%') { if (RAW == '%') {
NEXT; NEXT;
name = xmlParseName(ctxt); name = xmlParseNameComplex(ctxt);
if (name == NULL) { if (name == NULL) {
ctxt->errNo = XML_ERR_NAME_REQUIRED; ctxt->errNo = XML_ERR_NAME_REQUIRED;
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))