nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Datafilter 'stack overflow'

Browse Source 
.. catch problems with recursion from badly
   written datafilters by limiting function
   call stack depth to 500 calls.
This commit is contained in:
Mark Liversedge
2015-12-10 21:53:01 +00:00
parent a92d6c6c6a
commit dd1c709ea0
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/DataFilter.cpp
View File

@@ -1278,6 +1278,9 @@ Result DataFilter::evaluate(RideItem *item, RideFilePoint *p)
{
if (!item || !treeRoot || DataFiltererrors.count()) return Result(0);
// reset stack
stack = 0;
Result res(0);
// if we are a set of functions..
@@ -1510,7 +1513,22 @@ Result Leaf::eval(Context *context, DataFilter *df, Leaf *leaf, float x, RideIte
// calling a user defined function
if (df->functions.contains(leaf->function)) {
return eval(context, df, df->functions.value(leaf->function), x, m, p);
// going down
df->stack += 1;
// stack overflow
if (df->stack > 500) {
qDebug()<<"stack overflow";
df->stack = 0;
return Result(0);
}
Result res = eval(context, df, df->functions.value(leaf->function), x, m, p);
// pop stack - if we haven't overflowed and reset
if (df->stack > 0) df->stack -= 1;
return res;
}
if (leaf->function == "config") {