From 84e8f705f9a64e8f4dde9a4fe127dc3c79a14366 Mon Sep 17 00:00:00 2001 From: Desour Date: Tue, 25 Mar 2025 13:47:14 +0100 Subject: [PATCH] fix debug.getinfo not being unset in CPCSM (regression) was introduced in eeb6cab --- .luacheckrc | 2 +- builtin/client/init.lua | 3 +++ src/script/cpp_api/s_security.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index c98397085a..54cf9e3a2a 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -41,7 +41,7 @@ stds.menu_common = { }, } -files["builtin/client/register.lua"] = { +files["builtin/client/init.lua"] = { globals = { debug = {fields={"getinfo"}}, } diff --git a/builtin/client/init.lua b/builtin/client/init.lua index ee0f267db7..769fbe56cb 100644 --- a/builtin/client/init.lua +++ b/builtin/client/init.lua @@ -13,3 +13,6 @@ dofile(commonpath .. "information_formspecs.lua") dofile(clientpath .. "chatcommands.lua") dofile(clientpath .. "misc.lua") assert(loadfile(commonpath .. "item_s.lua"))({}) -- Just for push/read node functions + +-- unset, as promised in initializeSecurityClient() +debug.getinfo = nil diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index 99d68b204a..36f6b045b8 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -311,7 +311,7 @@ void ScriptApiSecurity::initializeSecurityClient() "time" }; static const char *debug_whitelist[] = { - "getinfo", // used by builtin and unset before mods load <- FIXME: doesn't actually happen + "getinfo", // used by builtin and unset before mods load "traceback" };