shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-19 14:50:07 +03:00
Code

Fix problem with specific and generic error handlers

Browse Source 
It seems that setting up both xmlTextReaderSetStructuredErrorHandler and
xmlSetStructuredErrorFunc confuses the code around error.c:592 and following
This patch works with any combinations of using xmlSetStructuredErrorFunc,
xmlTextReaderSetStructuredErrorHandler, both, or none.
This commit is contained in:
Pietro Cerutti 2012-08-27 13:24:08 +08:00 committed by Daniel Veillard
parent 466fcdaa33
commit 890faa546b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
error.c
View File

@ -615,8 +615,11 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
data = ctxt->userData;
} else if (channel == NULL) {
channel = xmlGenericError;
if (!data)
if (ctxt != NULL) {
data = ctxt;
} else {
data = xmlGenericErrorContext;
}
}
if (channel == NULL)
return;