From 0c66ac97e88d8562cd3b8a640b5f040cb1226117 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy <86008856+GenericHeroGuy@users.noreply.github.com> Date: Fri, 15 Nov 2024 14:18:56 +0100 Subject: [PATCH] Disable bytecode (1930cc9) --- src/bluajit/Makefile.cfg | 1 + src/bluajit/lj_arch.h | 6 ++++++ src/bluajit/lj_errmsg.h | 3 +++ src/bluajit/lj_load.c | 6 ++++++ 4 files changed, 16 insertions(+) diff --git a/src/bluajit/Makefile.cfg b/src/bluajit/Makefile.cfg index ec2dd8e4b..8fb19c869 100644 --- a/src/bluajit/Makefile.cfg +++ b/src/bluajit/Makefile.cfg @@ -23,6 +23,7 @@ XCFLAGS+= -DLUAJIT_DISABLE_FFI #XCFLAGS+= -DLUAJIT_USE_GDBJIT #XCFLAGS+= -DLUA_USE_APICHECK #XCFLAGS+= -DLUA_USE_ASSERT +XCFLAGS+= -DLUAJIT_DISABLE_BYTECODE # load standard libraries in debug mode, so jit.dump etc works ifndef DEBUGMODE diff --git a/src/bluajit/lj_arch.h b/src/bluajit/lj_arch.h index 994175b71..07b94eb53 100644 --- a/src/bluajit/lj_arch.h +++ b/src/bluajit/lj_arch.h @@ -598,6 +598,12 @@ #define LJ_HASBUFFER 1 #endif +#if defined(LUAJIT_DISABLE_BYTECODE) +#define LJ_HASBC 0 +#else +#define LJ_HASBC 1 +#endif + #if defined(LUAJIT_SRB2LIB) #define LJ_SRB2LIB 1 #else diff --git a/src/bluajit/lj_errmsg.h b/src/bluajit/lj_errmsg.h index bd4a0a024..91667ee71 100644 --- a/src/bluajit/lj_errmsg.h +++ b/src/bluajit/lj_errmsg.h @@ -155,6 +155,9 @@ ERRDEF(XPSEUDO, "pseudo-variable out of range or not in assignment") /* Bytecode reader errors. */ ERRDEF(BCFMT, "cannot load incompatible bytecode") ERRDEF(BCBAD, "cannot load malformed bytecode") +#if !LJ_HASBC +ERRDEF(BCDIS, "bytecode loading is permanently disabled") +#endif #if LJ_HASFFI /* FFI errors. */ diff --git a/src/bluajit/lj_load.c b/src/bluajit/lj_load.c index 5bb10b5b1..9d21f0f5e 100644 --- a/src/bluajit/lj_load.c +++ b/src/bluajit/lj_load.c @@ -34,6 +34,12 @@ static TValue *cpparser(lua_State *L, lua_CFunction dummy, void *ud) UNUSED(dummy); cframe_errfunc(L->cframe) = -1; /* Inherit error function. */ bc = lj_lex_setup(L, ls); +#if !LJ_HASBC + if (bc) { + setstrV(L, L->top++, lj_err_str(L, LJ_ERR_BCDIS)); + lj_err_throw(L, LUA_ERRSYNTAX); + } +#endif if (ls->mode) { int xmode = 1; const char *mode = ls->mode;