lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-16 07:21:58 +03:00
Code Activity

applied patch from Ashwin fixing a number of realloc problems improve

Browse Source 
* uri.c: applied patch from Ashwin fixing a number of realloc problems
* HTMLparser.c: improve handling for misplaced html/head/body
Daniel

svn path=/trunk/; revision=3740
This commit is contained in:
Daniel Veillard
2008-04-24 11:58:41 +00:00
parent e9100a589d
commit ed86dc2383
3 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
HTMLparser.c
View File

@ -3482,6 +3482,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
"htmlParseStartTag: misplaced <html> tag\n",
name, NULL);
discardtag = 1;
ctxt->depth++;
}
if ((ctxt->nameNr != 1) &&
(xmlStrEqual(name, BAD_CAST"head"))) {
@ -3489,6 +3490,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
"htmlParseStartTag: misplaced <head> tag\n",
name, NULL);
discardtag = 1;
ctxt->depth++;
}
if (xmlStrEqual(name, BAD_CAST"body")) {
int indx;
@ -3498,6 +3500,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
"htmlParseStartTag: misplaced <body> tag\n",
name, NULL);
discardtag = 1;
ctxt->depth++;
}
}
}
@ -3648,7 +3651,6 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
name = htmlParseHTMLName(ctxt);
if (name == NULL)
return (0);
/*
* We should definitely be at the ending "S? '>'" part
*/
@ -3668,6 +3670,18 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
} else
NEXT;
/*
* if we ignored misplaced tags in htmlParseStartTag don't pop them
* out now.
*/
if ((ctxt->depth > 0) &&
(xmlStrEqual(name, BAD_CAST "html") ||
xmlStrEqual(name, BAD_CAST "body") ||
xmlStrEqual(name, BAD_CAST "head"))) {
ctxt->depth--;
return (0);
}
/*
* If the name read is not one of the element in the parsing stack
* then return, it's just an error.