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

Patch from Dave Yearke <yearke@eng.buffalo.edu>:

- testHTML.c: fix core dump on Solaris 2.x systems
- HTMLparser.c: fix segfault if ctxt->sax->characters() is NULL
- result/HTML/*.sax: previous bug fix lead to new results
Daniel
This commit is contained in:
Daniel Veillard
2000-08-14 15:13:33 +00:00
parent 0310929cc4
commit 1255ab7780
6 changed files with 3352 additions and 3 deletions

View File

@ -1,3 +1,10 @@
Mon Aug 14 11:10:20 EDT 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* Patch from Dave Yearke <yearke@eng.buffalo.edu>:
* testHTML.c: fix core dump on Solaris 2.x systems
* HTMLparser.c: fix segfault if ctxt->sax->characters() is NULL
* result/HTML/*.sax: previous bug fix lead to new results
Mon Aug 14 10:26:09 EDT 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* Patch from Albert Chin-A-Young <china@thewrittenword.com>:

View File

@ -2866,7 +2866,8 @@ htmlParseReference(htmlParserCtxtPtr ctxt) {
} else {
ent = htmlParseEntityRef(ctxt, &name);
if (name == NULL) {
ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1);
if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
ctxt->sax->characters(ctxt->userData, BAD_CAST "&", 1);
return;
}
if ((ent == NULL) || (ent->value <= 0)) {

View File

@ -0,0 +1,27 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.startElement(html)
SAX.startElement(body)
SAX.error: htmlParseEntityRef: expecting ';'
SAX.error: htmlParseEntityRef: no name
SAX.startElement(p, tst='a&b', tst2='a&b', tst3='a & b')
SAX.characters(
a, 2)
SAX.characters(&, 1)
SAX.characters(b
a, 3)
SAX.error: htmlParseEntityRef: expecting ';'
SAX.characters(&, 1)
SAX.characters(b, 1)
SAX.characters(
a , 3)
SAX.error: htmlParseEntityRef: no name
SAX.characters(&, 1)
SAX.characters( b
, 3)
SAX.endElement(p)
SAX.ignorableWhitespace(
, 1)
SAX.endElement(body)
SAX.endElement(html)
SAX.endDocument()

View File

@ -0,0 +1,463 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(html, -//IETF//DTD HTML//EN, (null))
SAX.startElement(html)
SAX.characters(
, 2)
SAX.startElement(head)
SAX.characters(
, 1)
SAX.startElement(meta, name='GENERATOR', content='Microsoft FrontPage 4.0')
SAX.endElement(meta)
SAX.characters(
, 1)
SAX.startElement(title)
SAX.characters(README - Microsoft FrontPage 2, 51)
SAX.endElement(title)
SAX.characters(
, 1)
SAX.startElement(meta, name='Microsoft Theme', content='none')
SAX.endElement(meta)
SAX.characters(
, 1)
SAX.endElement(head)
SAX.characters(
, 2)
SAX.startElement(body)
SAX.characters(
, 1)
SAX.startElement(font, face='Verdana')
SAX.characters(
, 1)
SAX.startElement(h1)
SAX.startElement(a, name='top')
SAX.characters(Microsoft FrontPage 2000 Serve, 48)
SAX.endElement(a)
SAX.endElement(h1)
SAX.characters(
, 2)
SAX.startElement(font, size='2')
SAX.startElement(i)
SAX.characters(© Copyright Microsoft Corpora, 40)
SAX.characters( , 2)
SAX.endElement(i)
SAX.endElement(font)
SAX.characters(
, 3)
SAX.startElement(p)
SAX.characters(The FrontPage Server Extension, 88)
SAX.endElement(p)
SAX.startElement(ul)
SAX.characters(
, 3)
SAX.startElement(li)
SAX.characters(Authoring FrontPage webs, 24)
SAX.endElement(li)
SAX.characters(
, 3)
SAX.startElement(li)
SAX.characters(Administering FrontPage webs, 28)
SAX.endElement(li)
SAX.characters(
, 3)
SAX.startElement(li)
SAX.characters(Browse-time FrontPage web func, 39)
SAX.endElement(li)
SAX.characters(
, 1)
SAX.endElement(ul)
SAX.characters(
, 3)
SAX.startElement(h2)
SAX.characters(Contents, 8)
SAX.characters( , 2)
SAX.endElement(h2)
SAX.characters(
, 2)
SAX.startElement(a, href='#relnotes')
SAX.characters(Release Notes, 13)
SAX.endElement(a)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
, 1)
SAX.startElement(a, href='#moreinfo')
SAX.characters(Resources for More Information, 30)
SAX.endElement(a)
SAX.characters(
, 1)
SAX.startElement(p)
SAX.characters( , 2)
SAX.endElement(p)
SAX.characters(
, 1)
SAX.startElement(hr)
SAX.endElement(hr)
SAX.characters(
, 1)
SAX.startElement(h2)
SAX.startElement(a, name='relnotes')
SAX.characters(Release Notes, 13)
SAX.endElement(a)
SAX.endElement(h2)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(This section provides compleme, 136)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.startElement(a, href='#apache')
SAX.characters(Apache 1.3.4 Support, 20)
SAX.endElement(a)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
, 1)
SAX.startElement(a, href='#upgrading')
SAX.characters(Upgrading from previous versio, 62)
SAX.endElement(a)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
, 1)
SAX.startElement(a, href='#executables')
SAX.characters(Uploading files into executabl, 39)
SAX.endElement(a)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#top')
SAX.characters(Top of Page, 11)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(h3)
SAX.startElement(a, name='apache')
SAX.characters(Apache 1.3.4 Support, 20)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(You need to take some special , 360)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.endElement(font)
SAX.characters(
, 1)
SAX.startElement(blockquote)
SAX.characters(
, 3)
SAX.startElement(font, face='Courier New')
SAX.characters(
ResourceConfig /dev/null, 25)
SAX.characters( , 2)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
AccessConfig /dev/null, 23)
SAX.endElement(font)
SAX.characters(
, 1)
SAX.endElement(blockquote)
SAX.characters(
, 1)
SAX.startElement(font, face='Verdana')
SAX.characters(
, 3)
SAX.startElement(p)
SAX.characters(If you have some settings stor, 90)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(You must stop and restart the , 86)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#relnotes')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(h3)
SAX.startElement(a, name='upgrading')
SAX.characters(Upgrading from previous versio, 62)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(Custom entries in frontpage.cn, 67)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(When you install FrontPage 200, 359)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(Do not overwrite the FrontPage, 141)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#relnotes')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(h3)
SAX.startElement(a, name='executables')
SAX.characters(Uploading files into executabl, 39)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 3)
SAX.startElement(p)
SAX.characters(After upgrading to FrontPage 2, 385)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(p)
SAX.characters(To allow FrontPage authors to , 249)
SAX.startElement(a, href='http://officeupdate.microsoft.com/frontpage/wpp/serk/')
SAX.characters(http://officeupdate.microsoft., 53)
SAX.endElement(a)
SAX.characters(., 1)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#relnotes')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(hr)
SAX.endElement(hr)
SAX.characters(
, 4)
SAX.startElement(h2)
SAX.startElement(a, name='moreinfo')
SAX.characters(Resources for More Information, 30)
SAX.endElement(a)
SAX.endElement(h2)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(This section lists sources of , 85)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.startElement(a, href='#serk')
SAX.characters(Server Extensions Resource Kit, 30)
SAX.endElement(a)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
, 1)
SAX.startElement(a, href='#serkupdate')
SAX.characters(Server Extensions Resource Kit, 37)
SAX.endElement(a)
SAX.startElement(br)
SAX.endElement(br)
SAX.characters(
, 1)
SAX.startElement(a, href='#kb')
SAX.characters(Knowledge Base, 14)
SAX.endElement(a)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#top')
SAX.characters(Top of Page, 11)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(h3)
SAX.startElement(a, name='serk')
SAX.characters(Server Extensions Resource Kit, 30)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(The FrontPage 2000 Server Exte, 339)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(The Server Extensions Resource, 312)
SAX.endElement(p)
SAX.characters(
, 2)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#moreinfo')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(h3)
SAX.startElement(a, name='serkupdate')
SAX.characters(Server Extensions Resource Kit, 37)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(For updated information about , 157)
SAX.startElement(a, href='http://officeupdate.microsoft.com/frontpage/wpp/serk/')
SAX.characters(http://officeupdate.microsoft., 53)
SAX.endElement(a)
SAX.characters(., 1)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#moreinfo')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(h3)
SAX.startElement(a, name='kb')
SAX.characters(Microsoft Knowledge Base, 24)
SAX.endElement(a)
SAX.endElement(h3)
SAX.characters(
, 2)
SAX.startElement(p)
SAX.characters(For further technical informat, 254)
SAX.error: htmlParseEntityRef: no name
SAX.characters(&, 1)
SAX.characters( troubleshooters to find
fast, 302)
SAX.startElement(a, href='http://support.microsoft.com/support/')
SAX.characters(http://support.microsoft.com/s, 37)
SAX.endElement(a)
SAX.characters(., 1)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.startElement(p, align='right')
SAX.startElement(font, size='1')
SAX.startElement(a, href='#moreinfo')
SAX.characters(Top of Section, 14)
SAX.endElement(a)
SAX.endElement(font)
SAX.endElement(p)
SAX.characters(
, 3)
SAX.startElement(p)
SAX.characters( , 2)
SAX.endElement(p)
SAX.characters(
, 4)
SAX.endElement(font)
SAX.characters(
, 1)
SAX.endElement(body)
SAX.characters(
, 1)
SAX.endElement(html)
SAX.ignorableWhitespace(
, 1)
SAX.endDocument()

File diff suppressed because it is too large Load Diff

View File

@ -146,7 +146,8 @@ internalSubsetDebug(void *ctx, const xmlChar *name,
/* xmlDtdPtr externalSubset; */
fprintf(stdout, "SAX.internalSubset(%s, %s, %s)\n",
name, ExternalID, SystemID);
name, (ExternalID == NULL) ? "(null)" : ExternalID,
(SystemID == NULL) ? "(null)" : SystemID);
/***********
if ((ExternalID != NULL) || (SystemID != NULL)) {
@ -372,7 +373,7 @@ startElementDebug(void *ctx, const xmlChar *name, const xmlChar **atts)
if (atts != NULL) {
for (i = 0;(atts[i] != NULL);i++) {
fprintf(stdout, ", %s='", atts[i++]);
fprintf(stdout, "%s'", atts[i]);
fprintf(stdout, "%s'", (atts[i] == NULL) ? "(null)" : atts[i]);
}
}
fprintf(stdout, ")\n");