lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-08 21:42:07 +03:00
Code Activity

applied patch for param visibility from Shaun McCance. Changed variable

Browse Source 
* libexslt/functions.c: applied patch for param visibility from
  Shaun McCance.  Changed variable scoping in accordance with
  Shaun's suggestions.  This fixed problem reported on the list
  by Bernd Lang
* tests/exslt/functions/function.8.[xml,xsl,out], Makefile.am:
  regression test for above
This commit is contained in:
William M. Brack
2003-11-12 10:20:03 +00:00
parent cfc91f9c69
commit 0cd2f0c0e9
6 changed files with 119 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libexslt/functions.c
View File

@@ -262,7 +262,8 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
xmlXPathObjectPtr obj, oldResult, ret;
exsltFuncData *data;
exsltFuncFunctionData *func;
xmlNodePtr paramNode, oldInsert, fake;
xmlNodePtr paramNode, oldInsert, fake, content = NULL;
int oldBase;
xsltStackElemPtr params = NULL, param;
xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt);
int i;
@@ -289,8 +290,10 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
ctxt->error = XPATH_INVALID_ARITY;
return;
}
if (func->content != NULL)
if (func->content != NULL) {
paramNode = func->content->prev;
content = func->content;
}
else
paramNode = NULL;
if ((paramNode == NULL) && (func->nargs != 0)) {
@@ -299,14 +302,13 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
"param == NULL\n");
return;
}
/* defaulted params */
for (i = func->nargs; (i > nargs) && (paramNode != NULL); i--) {
param = xsltParseStylesheetCallerParam (tctxt, paramNode);
param->next = params;
params = param;
paramNode = paramNode->prev;
}
/* set params */
for (i = func->nargs; (i > nargs) && (paramNode != NULL); i--) {
paramNode = paramNode->prev;
if (content != NULL)
content = content->prev;
}
while ((i-- > 0) && (paramNode != NULL)) {
obj = valuePop(ctxt);
/* FIXME: this is a bit hackish */
@@ -327,9 +329,16 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
(const xmlChar *)"fake", NULL);
oldInsert = tctxt->insert;
tctxt->insert = fake;
/*
* In order to give the function variables a new 'scope' we
* change varsBase in the context.
*/
oldBase = tctxt->varsBase;
tctxt->varsBase = tctxt->varsNr;
xsltApplyOneTemplate (tctxt, xmlXPathGetContextNode(ctxt),
func->content, NULL, params);
content, NULL, params);
tctxt->insert = oldInsert;
tctxt->varsBase = oldBase; /* restore original scope */
if (params != NULL)
xsltFreeStackElemList(params);