lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix panicking during require because of long lived require context borrow

Browse source
This commit is contained in:
Filip Tibell 2025-05-02 12:27:20 +02:00
parent 6645631c46
commit 2e5b3bb5eb
No known key found for this signature in database
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/lune-std/src/globals/require/mod.rs
View file

@ -35,7 +35,18 @@ pub fn create(lua: Lua) -> LuaResult<LuaValue> {
3. The lua chunk we are require-ing from 3. The lua chunk we are require-ing from
*/ */
let require_fn = lua.create_async_function(require)?; let require_fn = lua.create_async_function(|lua, (source, path)| {
// NOTE: We need to make sure that the app data reference does not
// live through the entire require call, to prevent panicking from
// being unable to borrow other app data in the main body of scripts
let context = {
let context = lua
.app_data_ref::<RequireContext>()
.expect("Failed to get RequireContext from app data");
context.clone()
};
require(lua, context, source, path)
})?;
let get_source_fn = lua.create_function(move |lua, (): ()| match lua.inspect_stack(2) { let get_source_fn = lua.create_function(move |lua, (): ()| match lua.inspect_stack(2) {
None => Err(LuaError::runtime( None => Err(LuaError::runtime(
"Failed to get stack info for require source", "Failed to get stack info for require source",
@ -60,7 +71,12 @@ pub fn create(lua: Lua) -> LuaResult<LuaValue> {
.into_lua(&lua) .into_lua(&lua)
} }
async fn require(lua: Lua, (source, path): (LuaString, LuaString)) -> LuaResult<LuaMultiValue> { async fn require(
lua: Lua,
context: RequireContext,
source: LuaString,
path: LuaString,
) -> LuaResult<LuaMultiValue> {
let source = source let source = source
.to_str() .to_str()
.into_lua_err() .into_lua_err()
@ -73,11 +89,6 @@ async fn require(lua: Lua, (source, path): (LuaString, LuaString)) -> LuaResult<
.context("Failed to parse require path as string")? .context("Failed to parse require path as string")?
.to_string(); .to_string();
let context = lua
.app_data_ref::<RequireContext>()
.expect("Failed to get RequireContext from app data")
.clone();
if let Some(builtin_name) = path.strip_prefix("@lune/").map(str::to_ascii_lowercase) { if let Some(builtin_name) = path.strip_prefix("@lune/").map(str::to_ascii_lowercase) {
library::require(lua, &context, &builtin_name) library::require(lua, &context, &builtin_name)
} else if let Some(self_path) = path.strip_prefix("@self/") { } else if let Some(self_path) = path.strip_prefix("@self/") {