evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loadstring shouldn't accept bytecode

Browse Source
This commit is contained in:
Kae 2024-02-22 17:25:46 +11:00
parent f5ddb00675
commit ae3ecabcea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/core/StarLua.cpp
View File

@ -1142,7 +1142,7 @@ LuaFunction LuaEngine::createRawFunction(lua_CFunction function) {
LuaFunction LuaEngine::createFunctionFromSource(int handleIndex, char const* contents, size_t size, char const* name) { LuaFunction LuaEngine::createFunctionFromSource(int handleIndex, char const* contents, size_t size, char const* name) {
lua_checkstack(m_state, 2); lua_checkstack(m_state, 2);
handleError(m_state, luaL_loadbuffer(m_state, contents, size, name)); handleError(m_state, luaL_loadbufferx(m_state, contents, size, name, "t"));
pushHandle(m_state, handleIndex); pushHandle(m_state, handleIndex);
lua_setupvalue(m_state, -2, 1); lua_setupvalue(m_state, -2, 1);

4
source/game/scripting/StarLuaRoot.cpp
View File

@ -108,9 +108,9 @@ LuaContext LuaRoot::createContext(StringList const& scriptPaths) {
auto handleIndex = newContext.handleIndex(); auto handleIndex = newContext.handleIndex();
auto engine = m_luaEngine.get(); auto engine = m_luaEngine.get();
newContext.set("loadstring", m_luaEngine->createFunction([engine,handleIndex](String const& source, Maybe<String> const& name, Maybe<LuaValue> const& env) -> LuaFunction { newContext.set("loadstring", m_luaEngine->createFunction([engine, handleIndex](String const& source, Maybe<String> const& name, Maybe<LuaTable> const& env) -> LuaFunction {
String functionName = name ? strf("loadstring: {}", *name) : "loadstring"; String functionName = name ? strf("loadstring: {}", *name) : "loadstring";
return engine->createFunctionFromSource(handleIndex, source.utf8Ptr(), source.utf8Size(), functionName.utf8Ptr()); return engine->createFunctionFromSource(env ? env->handleIndex() : handleIndex, source.utf8Ptr(), source.utf8Size(), functionName.utf8Ptr());
})); }));
auto assets = Root::singleton().assets(); auto assets = Root::singleton().assets();