Merge pull request #31 from SeisSol/fix/stack-overflow

Fix stack overflow.
SeisSol · Feb 23, 2022 · a05f647 · a05f647
2 parents 91199ba + 3b1486b
commit a05f647
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/component/LuaMap.cpp b/src/component/LuaMap.cpp
@@ -43,6 +43,10 @@ double LuaMap::executeLuaFunction(Matrix<double> x,
             std::abort();
         }
     }
+
+    // Save stack size
+    const auto top = lua_gettop(luaState);
+
 
     // Push function and arguments to stack
     lua_getglobal(luaState, "f");  // the function
@@ -68,7 +72,14 @@ double LuaMap::executeLuaFunction(Matrix<double> x,
         << std::endl;
         std::abort();
     }
-    return getField(luaState, idxToOutputName[funcIdx]);
+
+    const auto retVal = getField(luaState, idxToOutputName[funcIdx]);
+
+    // Reset stack size to value before function call
+    // This should avoid stack overflows
+    lua_settop(luaState, top); 
+
+    return retVal;
 }
 
 Matrix<double> LuaMap::map(Matrix<double>& x) {