diff options
| author | setser <setser@yandex-team.ru> | 2022-05-09 00:13:37 +0300 |
|---|---|---|
| committer | setser <setser@yandex-team.ru> | 2022-05-09 00:13:37 +0300 |
| commit | e87e3fc8d0e04eb7ba3eee221bb91613b527ad85 (patch) | |
| tree | 5279c128bdbdf902b9a08d9fae8e55b91910a553 /contrib/libs/libxml/error.c | |
| parent | f4f3e4024a1f32bd0bc3fa20239025a1b179e42d (diff) | |
| download | ydb-e87e3fc8d0e04eb7ba3eee221bb91613b527ad85.tar.gz | |
Update libxml to 2.9.13
ref:f572491d236694e847142c36f0f5546c649e05d7
Diffstat (limited to 'contrib/libs/libxml/error.c')
| -rw-r--r-- | contrib/libs/libxml/error.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/libs/libxml/error.c b/contrib/libs/libxml/error.c index b7d5b36bc7..9ff1c2ba49 100644 --- a/contrib/libs/libxml/error.c +++ b/contrib/libs/libxml/error.c @@ -146,7 +146,7 @@ xmlSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler) { * xmlParserPrintFileInfo: * @input: an xmlParserInputPtr input * - * Displays the associated file and line informations for the current input + * Displays the associated file and line information for the current input */ void @@ -557,6 +557,7 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel, * of the usual "base" (doc->URL) for the node (bug 152623). */ xmlNodePtr prev = baseptr; + char *href = NULL; int inclcount = 0; while (prev != NULL) { if (prev->prev == NULL) @@ -564,21 +565,20 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel, else { prev = prev->prev; if (prev->type == XML_XINCLUDE_START) { - if (--inclcount < 0) - break; + if (inclcount > 0) { + --inclcount; + } else { + href = (char *) xmlGetProp(prev, BAD_CAST "href"); + if (href != NULL) + break; + } } else if (prev->type == XML_XINCLUDE_END) inclcount++; } } - if (prev != NULL) { - if (prev->type == XML_XINCLUDE_START) { - prev->type = XML_ELEMENT_NODE; - to->file = (char *) xmlGetProp(prev, BAD_CAST "href"); - prev->type = XML_XINCLUDE_START; - } else { - to->file = (char *) xmlGetProp(prev, BAD_CAST "href"); - } - } else + if (href != NULL) + to->file = href; + else #endif to->file = (char *) xmlStrdup(baseptr->doc->URL); if ((to->file == NULL) && (node != NULL) && (node->doc != NULL)) { @@ -643,7 +643,7 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel, * @domain: where the error comes from * @code: the error code * @node: the context node - * @extra: extra informations + * @extra: extra information * * Handle an out of memory condition */ |