fix: lua setInterval stack overflow
This commit is contained in:
parent
fc34ca6875
commit
fe55b94ebd
@ -8,6 +8,7 @@
|
||||
#include "../graphics/ui/elements/TrackBar.hpp"
|
||||
#include "../graphics/ui/elements/InputBindBox.hpp"
|
||||
#include "../graphics/render/WorldRenderer.hpp"
|
||||
#include "../logic/scripting/scripting.hpp"
|
||||
#include "../objects/Player.hpp"
|
||||
#include "../physics/Hitbox.hpp"
|
||||
#include "../util/stringutil.hpp"
|
||||
@ -65,6 +66,9 @@ std::shared_ptr<UINode> create_debug_panel(
|
||||
return L"speakers: " + std::to_wstring(audio::count_speakers())+
|
||||
L" streams: " + std::to_wstring(audio::count_streams());
|
||||
}));
|
||||
panel->add(create_label([](){
|
||||
return L"lua-stack: " + std::to_wstring(scripting::get_values_on_stack());
|
||||
}));
|
||||
panel->add(create_label([=](){
|
||||
auto& settings = engine->getSettings();
|
||||
bool culling = settings.graphics.frustumCulling.get();
|
||||
|
||||
@ -22,6 +22,7 @@ static void remove_lib_funcs(lua::State* L, const char* libname, const char* fun
|
||||
setfield(L, funcs[i], -2);
|
||||
}
|
||||
}
|
||||
pop(L);
|
||||
}
|
||||
|
||||
static void create_libs(lua::State* L) {
|
||||
@ -44,6 +45,7 @@ static void create_libs(lua::State* L) {
|
||||
addfunc(L, "print", lua::wrap<l_print>);
|
||||
}
|
||||
|
||||
#include <iostream>
|
||||
void lua::initialize() {
|
||||
logger.info() << LUA_VERSION;
|
||||
logger.info() << LUAJIT_VERSION;
|
||||
@ -54,15 +56,14 @@ void lua::initialize() {
|
||||
}
|
||||
main_thread = L;
|
||||
// Allowed standard libraries
|
||||
luaopen_base(L);
|
||||
luaopen_math(L);
|
||||
luaopen_string(L);
|
||||
luaopen_table(L);
|
||||
luaopen_debug(L);
|
||||
luaopen_jit(L);
|
||||
luaopen_bit(L);
|
||||
|
||||
luaopen_os(L);
|
||||
pop(L, luaopen_base(L));
|
||||
pop(L, luaopen_math(L));
|
||||
pop(L, luaopen_string(L));
|
||||
pop(L, luaopen_table(L));
|
||||
pop(L, luaopen_debug(L));
|
||||
pop(L, luaopen_jit(L));
|
||||
pop(L, luaopen_bit(L));
|
||||
pop(L, luaopen_os(L));
|
||||
const char* removed_os[] {
|
||||
"execute",
|
||||
"exit",
|
||||
|
||||
@ -145,7 +145,7 @@ void lua::dump_stack(State* L) {
|
||||
}
|
||||
}
|
||||
|
||||
static std::shared_ptr<std::string> createLambdaHandler(State* L) {
|
||||
static std::shared_ptr<std::string> create_lambda_handler(State* L) {
|
||||
auto ptr = reinterpret_cast<ptrdiff_t>(topointer(L, -1));
|
||||
auto name = util::mangleid(ptr);
|
||||
getglobal(L, LAMBDAS_TABLE);
|
||||
@ -163,16 +163,17 @@ static std::shared_ptr<std::string> createLambdaHandler(State* L) {
|
||||
}
|
||||
|
||||
runnable lua::create_runnable(State* L) {
|
||||
auto funcptr = createLambdaHandler(L);
|
||||
auto funcptr = create_lambda_handler(L);
|
||||
return [=]() {
|
||||
getglobal(L, LAMBDAS_TABLE);
|
||||
getfield(L, *funcptr);
|
||||
call_nothrow(L, 0);
|
||||
pop(L);
|
||||
};
|
||||
}
|
||||
|
||||
scripting::common_func lua::create_lambda(State* L) {
|
||||
auto funcptr = createLambdaHandler(L);
|
||||
auto funcptr = create_lambda_handler(L);
|
||||
return [=](const std::vector<dynamic::Value>& args) {
|
||||
getglobal(L, LAMBDAS_TABLE);
|
||||
getfield(L, *funcptr);
|
||||
|
||||
@ -277,6 +277,10 @@ bool scripting::register_event(int env, const std::string& name, const std::stri
|
||||
return false;
|
||||
}
|
||||
|
||||
int scripting::get_values_on_stack() {
|
||||
return lua::gettop(lua::get_main_thread());
|
||||
}
|
||||
|
||||
void scripting::load_block_script(const scriptenv& senv, const std::string& prefix, const fs::path& file, block_funcs_set& funcsset) {
|
||||
int env = *senv;
|
||||
std::string src = files::read_string(file);
|
||||
|
||||
@ -41,7 +41,8 @@ namespace scripting {
|
||||
|
||||
void initialize(Engine* engine);
|
||||
|
||||
extern bool register_event(int env, const std::string& name, const std::string& id);
|
||||
bool register_event(int env, const std::string& name, const std::string& id);
|
||||
int get_values_on_stack();
|
||||
|
||||
scriptenv get_root_environment();
|
||||
scriptenv create_pack_environment(const ContentPack& pack);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user