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

Detect deep recusion on function calls

Browse Source 
* libxslt/xsltInternals.h libexslt/functions.c: add a function call
  counting in the transformation context, and test/increment/decrement
  in exsltFuncFunctionFunction enter and exit
This commit is contained in:
Daniel Veillard
2009-09-17 11:56:08 +02:00
parent b1ca88f459
commit 3058d809d2
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libexslt/functions.c
View File

@@ -57,6 +57,8 @@ static void exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt,
int nargs); int nargs);
static exsltFuncFunctionData *exsltFuncNewFunctionData(void); static exsltFuncFunctionData *exsltFuncNewFunctionData(void);
#define MAX_FUNC_RECURSION 1000
/*static const xmlChar *exsltResultDataID = (const xmlChar *) "EXSLT Result";*/ /*static const xmlChar *exsltResultDataID = (const xmlChar *) "EXSLT Result";*/
/** /**
@@ -321,6 +323,15 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
"param == NULL\n"); "param == NULL\n");
return; return;
} }
if (tctxt->funcLevel > MAX_FUNC_RECURSION) {
xsltGenericError(xsltGenericErrorContext,
"{%s}%s: detected a recursion\n",
ctxt->context->functionURI, ctxt->context->function);
ctxt->error = XPATH_MEMORY_ERROR;
return;
}
tctxt->funcLevel++;
/* /*
* We have a problem with the evaluation of function parameters. * We have a problem with the evaluation of function parameters.
* The original library code did not evaluate XPath expressions until * The original library code did not evaluate XPath expressions until
@@ -437,6 +448,7 @@ error:
* the calling process exits. * the calling process exits.
*/ */
xsltExtensionInstructionResultFinalize(tctxt); xsltExtensionInstructionResultFinalize(tctxt);
tctxt->funcLevel--;
} }

1
libxslt/xsltInternals.h
View File

@@ -1774,6 +1774,7 @@ struct _xsltTransformContext {
exits */ exits */
xmlDocPtr localRVTBase; xmlDocPtr localRVTBase;
int keyInitLevel; /* Needed to catch recursive keys issues */ int keyInitLevel; /* Needed to catch recursive keys issues */
int funcLevel; /* Needed to catch recursive functions issues */
}; };
/** /**