diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-10-31 10:36:03 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-10-31 10:36:03 +0000 |
| commit | 157fee019d02e1ba4ed377ea21172b67f479241b (patch) | |
| tree | a4d39c614ae74410bfb87a021037255187b3de95 /parserInternals.c | |
| parent | 8a0a633ceaaf93faae6900d3c13d6328f4f06a9d (diff) | |
| download | android_external_libxml2-157fee019d02e1ba4ed377ea21172b67f479241b.tar.gz android_external_libxml2-157fee019d02e1ba4ed377ea21172b67f479241b.tar.bz2 android_external_libxml2-157fee019d02e1ba4ed377ea21172b67f479241b.zip | |
previous fix for #124044 was broken, correct fix provided. fix
* python/libxml.c: previous fix for #124044 was broken, correct
fix provided.
* HTMLparser.c parser.c parserInternals.c xmlIO.c: fix xmlStopParser()
and the error handlers to address #125877
Daniel
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/parserInternals.c b/parserInternals.c index 7d18788a..67fbd639 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -105,6 +105,9 @@ xmlCheckVersion(int version) { void xmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra) { + if ((ctxt != NULL) && (ctxt->disableSAX != 0) && + (ctxt->instate == XML_PARSER_EOF)) + return; if (ctxt != NULL) { ctxt->errNo = XML_ERR_NO_MEMORY; ctxt->instate = XML_PARSER_EOF; @@ -135,6 +138,9 @@ void __xmlErrEncoding(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *msg, const xmlChar * str1, const xmlChar * str2) { + if ((ctxt != NULL) && (ctxt->disableSAX != 0) && + (ctxt->instate == XML_PARSER_EOF)) + return; if (ctxt != NULL) ctxt->errNo = error; __xmlRaiseError(NULL, NULL, NULL, @@ -159,6 +165,9 @@ __xmlErrEncoding(xmlParserCtxtPtr ctxt, xmlParserErrors error, static void xmlErrInternal(xmlParserCtxtPtr ctxt, const char *msg, const xmlChar * str) { + if ((ctxt != NULL) && (ctxt->disableSAX != 0) && + (ctxt->instate == XML_PARSER_EOF)) + return; if (ctxt != NULL) ctxt->errNo = XML_ERR_INTERNAL_ERROR; __xmlRaiseError(NULL, NULL, NULL, @@ -185,6 +194,9 @@ static void xmlErrEncodingInt(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *msg, int val) { + if ((ctxt != NULL) && (ctxt->disableSAX != 0) && + (ctxt->instate == XML_PARSER_EOF)) + return; if (ctxt != NULL) ctxt->errNo = error; __xmlRaiseError(NULL, NULL, NULL, |