1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-10-26 12:25:09 +03:00

fix structured error handling problems #564217 daniel

* error.c: fix structured error handling problems #564217
daniel

svn path=/trunk/; revision=3826
This commit is contained in:
Daniel Veillard 2009-04-02 12:04:35 +00:00
parent 9c0aa472d9
commit 719f397e6f
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
Thu Apr 2 13:57:15 CEST 2009 Daniel Veillard <daniel@veillard.com>
* error.c: fix structured error handling problems #564217
Thu Mar 26 19:08:08 CET 2009 Rob Richards <rrichards@cdatazone.org>
* parser.c: use options from current parser context when creating

View File

@ -600,12 +600,12 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
channel = ctxt->sax->error;
data = ctxt->userData;
} else if (channel == NULL) {
if (xmlStructuredError != NULL)
if ((schannel == NULL) && (xmlStructuredError != NULL))
schannel = xmlStructuredError;
else
channel = xmlGenericError;
if (!data) {
data = xmlGenericErrorContext;
data = xmlGenericErrorContext;
}
}
if (schannel != NULL) {