shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-04 01:47:02 +03:00
Code

__xmlRaiseError: fix use of the structured callback channel

Browse Source 
If the structured callback channel is initialized, do not perform
unneeded initialization of the old callback channel to avoid
clobbering of the structured callback channel's data.
This commit is contained in:
Дмитрий Левин 2011-02-23 22:44:05 +08:00 committed by Daniel Veillard
parent 241d4a1069
commit c2a0fdc4e6
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
error.c
View File

@ -584,6 +584,11 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
if (to != &xmlLastError)
xmlCopyError(to,&xmlLastError);
if (schannel != NULL) {
schannel(data, to);
return;
}
/*
* Find the callback channel if channel param is NULL
*/
@ -595,19 +600,9 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
channel = ctxt->sax->error;
data = ctxt->userData;
} else if (channel == NULL) {
if ((schannel == NULL) && (xmlStructuredError != NULL)) {
schannel = xmlStructuredError;
data = xmlStructuredErrorContext;
} else {
channel = xmlGenericError;
if (!data) {
data = xmlGenericErrorContext;
}
}
}
if (schannel != NULL) {
schannel(data, to);
return;
channel = xmlGenericError;
if (!data)
data = xmlGenericErrorContext;
}
if (channel == NULL)
return;