From 14304ab4ec4c3c3c0acfeca16a770af6efd87ad1 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 4 Nov 2003 13:06:32 +0000 Subject: [PATCH] fixing the Document element precompilation to avoid the problem raised in * libxslt/preproc.c: fixing the Document element precompilation to avoid the problem raised in #125614 Daniel --- ChangeLog | 5 +++++ libxslt/preproc.c | 20 +------------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e1c2fd..bed4b9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 4 14:04:58 CET 2003 Daniel Veillard + + * libxslt/preproc.c: fixing the Document element precompilation + to avoid the problem raised in #125614 + Tue Nov 4 01:08:17 PST 2003 William Brack * tests/multiple/out/letter*.orig: updated to reflect change diff --git a/libxslt/preproc.c b/libxslt/preproc.c index 0d63f9e..63f7f7a 100644 --- a/libxslt/preproc.c +++ b/libxslt/preproc.c @@ -204,7 +204,6 @@ xsltDocumentComp(xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function ATTRIBUTE_UNUSED) { xsltStylePreCompPtr comp; xmlChar *filename = NULL; - xmlChar *base = NULL; xmlChar *URL = NULL; comp = xsltNewStylePreComp(style, XSLT_FUNC_DOCUMENT); @@ -253,29 +252,12 @@ xsltDocumentComp(xsltStylesheetPtr style, xmlNodePtr inst, } if (filename != NULL) { - /* - * Compute output URL - */ - base = xmlNodeGetBase(inst->doc, inst); - URL = xmlBuildURI(filename, base); - if (URL == NULL) { - xsltTransformError(NULL, style, inst, - "xsltDocumentComp: URL computation failed %s\n", filename); - if (style != NULL) style->warnings++; - comp->filename = xmlStrdup(filename); - } else { - comp->filename = URL; - } + comp->filename = filename; } else { comp->filename = NULL; } error: - if (base != NULL) - xmlFree(base); - if (filename != NULL) - xmlFree(filename); - return ((xsltElemPreCompPtr) comp); } -- 2.7.4