c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup fixing bug #125653 sometimes the error handlers can get a parser

Browse Source 
* Makefile.am: cleanup
* error.c valid.c include/libxml/xmlerror.h: fixing bug #125653
  sometimes the error handlers can get a parser context on DTD
  errors, and sometime they don't. So be very careful when trying
  to grab those informations.
Daniel
This commit is contained in:
Daniel Veillard 2003-10-28 15:44:17 +00:00
parent f4e5629809
commit 72b9e29edf
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Oct 28 16:42:16 CET 2003 Daniel Veillard <daniel@veillard.com>
* Makefile.am: cleanup
* error.c valid.c include/libxml/xmlerror.h: fixing bug #125653
sometimes the error handlers can get a parser context on DTD
errors, and sometime they don't. So be very careful when trying
to grab those informations.
Tue Oct 28 15:26:18 CET 2003 Daniel Veillard <daniel@veillard.com>
* tree.c: applied patch from Kasimier Buchcik which fixes a

2
Makefile.am
View File

@ -184,9 +184,7 @@ HTMLPushtests : testHTML$(EXEEXT)
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
rm result.$$name.sax ; \
fi ; fi ; done)
@echo "##"
@echo "## Push HTML SAX regression tests"
@echo "##"
-@(for i in $(srcdir)/test/HTML/* ; do \
name=`basename $$i`; \
if [ ! -d $$i ] ; then \

9
error.c
View File

@ -301,6 +301,7 @@ xmlReportError(xmlErrorPtr err, xmlParserCtxtPtr ctxt, const char *str,
channel(data, "namespace ");
break;
case XML_FROM_DTD:
case XML_FROM_VALID:
channel(data, "validity ");
break;
case XML_FROM_HTML:
@ -454,6 +455,14 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
(ctxt->sax->initialized == XML_SAX2_MAGIC))
schannel = ctxt->sax->serror;
}
if ((domain == XML_FROM_VALID) &&
((channel == xmlParserValidityError) ||
(channel == xmlParserValidityWarning))) {
ctxt = (xmlParserCtxtPtr) ctx;
if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
(ctxt->sax->initialized == XML_SAX2_MAGIC))
schannel = ctxt->sax->serror;
}
if (code == XML_ERR_OK)
return;
/*

5
include/libxml/xmlerror.h
View File

@ -29,7 +29,7 @@ typedef enum {
XML_FROM_PARSER, /* The XML parser */
XML_FROM_TREE, /* The tree module */
XML_FROM_NAMESPACE, /* The XML Namespace module */
XML_FROM_DTD, /* The XML DTD validation */
XML_FROM_DTD, /* The XML DTD validation with parser context*/
XML_FROM_HTML, /* The HTML parser */
XML_FROM_MEMORY, /* The memory allocator */
XML_FROM_OUTPUT, /* The serialization code */
@ -47,7 +47,8 @@ typedef enum {
XML_FROM_RELAXNGV, /* The Relax-NG validator module */
XML_FROM_CATALOG, /* The Catalog module */
XML_FROM_C14N, /* The Canonicalization module */
XML_FROM_XSLT /* The XSLT engine from libxslt */
XML_FROM_XSLT, /* The XSLT engine from libxslt */
XML_FROM_VALID /* The XML DTD validation with valid context */
} xmlErrorDomain;
/**

16
valid.c
View File

@ -62,12 +62,12 @@ xmlVErrMemory(xmlValidCtxtPtr ctxt, const char *extra)
}
if (extra)
__xmlRaiseError(NULL, channel, data,
pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY,
pctxt, NULL, XML_FROM_VALID, XML_ERR_NO_MEMORY,
XML_ERR_FATAL, NULL, 0, extra, NULL, NULL, 0, 0,
"Memory allocation failed : %s\n", extra);
else
__xmlRaiseError(NULL, channel, data,
pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY,
pctxt, NULL, XML_FROM_VALID, XML_ERR_NO_MEMORY,
XML_ERR_FATAL, NULL, 0, NULL, NULL, NULL, 0, 0,
"Memory allocation failed\n");
}
@ -95,12 +95,12 @@ xmlErrValid(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlParserErrors error,
}
if (extra)
__xmlRaiseError(NULL, channel, data,
pctxt, NULL, XML_FROM_DTD, error,
pctxt, NULL, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, extra, NULL, NULL, 0, 0,
msg, extra);
else
__xmlRaiseError(NULL, channel, data,
pctxt, NULL, XML_FROM_DTD, error,
pctxt, NULL, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, NULL, NULL, NULL, 0, 0,
msg);
}
@ -118,7 +118,7 @@ xmlErrValid(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlParserErrors error,
* Handle a validation error, provide contextual informations
*/
static void
xmlErrValidNodeNr(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
xmlNodePtr node, xmlParserErrors error,
const char *msg, const xmlChar * str1,
int int2, const xmlChar * str3)
@ -134,7 +134,7 @@ xmlErrValidNodeNr(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0,
(const char *) str1,
(const char *) str3,
@ -168,7 +168,7 @@ xmlErrValidNode(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0,
(const char *) str1,
(const char *) str1,
@ -202,7 +202,7 @@ xmlErrValidWarning(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
__xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_WARNING, NULL, 0,
(const char *) str1,
(const char *) str1,