Optionally (but by default) remove package.loadlib.

Author: jugglerchris

src/lua.rs

@@ -65,9 +65,11 @@ bitflags! {
     pub struct InitFlags: u32 {
         const PCALL_WRAPPERS = 0x1;
         const LOAD_WRAPPERS = 0x2;
+        const REMOVE_LOADLIB = 0x4;
 
         const DEFAULT = InitFlags::PCALL_WRAPPERS.bits |
-                        InitFlags::LOAD_WRAPPERS.bits;
+                        InitFlags::LOAD_WRAPPERS.bits |
+                        InitFlags::REMOVE_LOADLIB.bits;
         const NONE = 0;
     }
 }
@@ -707,6 +709,21 @@ unsafe fn create_lua(lua_mod_to_load: StdLib, init_flags: InitFlags) -> Lua {
                 assert_eq!(result, 0);
             }
 
+            if init_flags.contains(InitFlags::REMOVE_LOADLIB) {
+                ffi::lua_getglobal(state, cstr!("package"));
+                let t = ffi::lua_type(state, -1);
+                if t == ffi::LUA_TTABLE {
+                    // Package is loaded
+                    ffi::lua_pushnil(state);
+                    ffi::lua_setfield(state, -2, cstr!("loadlib"));
+                } else {
+                    // Assume it's not present otherwise.
+                    assert_eq!(t, ffi::LUA_TNIL);
+                }
+                // Pop the package (or nil) off the stack.
+                ffi::lua_pop(state, 1);
+            }
+
             // Create ref stack thread and place it in the registry to prevent it from being garbage
             // collected.
 

tests/tests.rs

@@ -865,6 +865,31 @@ fn test_no_loadstring_wrappers() {
     };
 }
 
+#[test]
+fn test_default_loadlib() {
+    Lua::new().context(|lua| {
+        let globals = lua.globals();
+        let package = globals.get::<_, Table>("package").unwrap();
+        let loadlib = package.get::<_, Function>("loadlib");
+        assert!(loadlib.is_err());
+    });
+}
+
+#[test]
+fn test_no_remove_loadlib() {
+    unsafe {
+        Lua::unsafe_new_with_flags(
+            StdLib::ALL_NO_DEBUG,
+            InitFlags::DEFAULT - InitFlags::REMOVE_LOADLIB,
+        )
+        .context(|lua| {
+            let globals = lua.globals();
+            let package = globals.get::<_, Table>("package").unwrap();
+            let _loadlib = package.get::<_, Function>("loadlib").unwrap();
+        });
+    }
+}
+
 #[test]
 fn test_result_conversions() {
     Lua::new().context(|lua| {