.gitlab-ci.yml

@@ -28,7 +28,7 @@ variables:
   KANIKO_REGISTRY_MIRROR: docker-proxy.binary.picodata.io
   CACHE_PATHS: target
   CARGO_INCREMENTAL: 0
-  RUST_VERSION: "1.70"  # Note: without the quotes yaml thinks this is a float and removes the trailing 0
+  RUST_VERSION: "1.71"  # Note: without the quotes yaml thinks this is a float and removes the trailing 0
   CARGO_HOME: /shared-storage/tarantool-module/.cargo
   BASE_IMAGE_VANILLA: docker-public.binary.picodata.io/tarantool-module-build-base-vanilla
   BASE_IMAGE_FORK: docker-public.binary.picodata.io/tarantool-module-build-base-fork

CHANGELOG.md

@@ -35,6 +35,9 @@ restricting time connection establishment.
 ### Breaking changes
 - Replace `network::protocol::codec::{encode_header, decode_header}` functions
   with `network::protocol::codec::Header::{encode, decode}` methods.
+- Use `extern "C-unwind"` instead of `extern "C"` for all trampolines which take `*mut ffi::lua_State`
+  (checked with `rg 'extern "C".*lua_State'`). `tlua::error!` throws an exception to unwind the stack,
+  hence we need to use a proper ABI to fix UB in picodata.
 
 ### Added (picodata)
 

tarantool-proc/src/lib.rs

@@ -50,7 +50,7 @@ mod msgpack {
         pub tarantool: Option<String>,
         /// Allows optional fields of unnamed structs to be decoded if values are not presented.
         pub allow_array_optionals: bool,
-        /// https://serde.rs/enum-representations.html#untagged
+        /// <https://serde.rs/enum-representations.html#untagged>
         pub untagged: bool,
     }
 

tarantool/Cargo.toml

@@ -15,7 +15,7 @@ documentation = "https://docs.rs/tarantool/"
 repository = "https://github.com/picodata/tarantool-module"
 keywords = ["ffi", "database", "tarantool"]
 categories = ["database"]
-rust-version = "1.70"
+rust-version = "1.71"
 
 [dependencies]
 base64 = "0.13"

tarantool/src/fiber.rs

@@ -895,7 +895,7 @@ where
         }
     }
 
-    unsafe extern "C" fn trampoline_for_lua(l: *mut lua::lua_State) -> i32 {
+    unsafe extern "C-unwind" fn trampoline_for_lua(l: *mut lua::lua_State) -> i32 {
         let ud_ptr = lua::lua_touserdata(l, lua::lua_upvalueindex(1));
 
         let f = (ud_ptr as *mut Option<F>)
@@ -1014,7 +1014,7 @@ mod impl_details {
 
         /// A callback for the "__gc" event. It checks if the value was moved out
         /// and if not it drops the value.
-        unsafe extern "C" fn wrap_gc<T>(lua: *mut ffi::lua_State) -> i32 {
+        unsafe extern "C-unwind" fn wrap_gc<T>(lua: *mut ffi::lua_State) -> i32 {
             let ud_ptr = ffi::lua_touserdata(lua, 1);
             let ud = ud_ptr
                 .cast::<UDBox<T>>()

tlua/src/ffi.rs

@@ -109,7 +109,7 @@ pub type lua_Integer = libc::ptrdiff_t;
 ///     return 2;                   /* number of results */
 /// }
 /// ```
-pub type lua_CFunction = unsafe extern "C" fn(l: *mut lua_State) -> c_int;
+pub type lua_CFunction = unsafe extern "C-unwind" fn(l: *mut lua_State) -> c_int;
 
 pub type lua_Alloc = extern "C" fn(
     ud: *mut libc::c_void,

tlua/src/functions_write.rs

@@ -245,7 +245,7 @@ macro_rules! impl_function_ext {
                     ffi::lua_pushcclosure(lua.as_lua(), wrapper::<Self, _, R>, 1);
                     return Ok(PushGuard::new(lua, 1));
 
-                    extern "C" fn wrap_gc<T>(lua: LuaState) -> i32 {
+                    extern "C-unwind" fn wrap_gc<T>(lua: LuaState) -> i32 {
                         unsafe {
                             let obj = ffi::lua_touserdata(lua, -1);
                             ptr::drop_in_place(obj.cast::<T>());
@@ -313,7 +313,7 @@ impl_function_ext! {A B C D E F G H I J K M N}
 /// use tlua::{Lua, CFunction, LuaState, ffi};
 ///
 /// let lua = Lua::new();
-/// unsafe extern "C" fn return_42(lua: LuaState) -> libc::c_int {
+/// unsafe extern "C-unwind" fn return_42(lua: LuaState) -> libc::c_int {
 ///     ffi::lua_pushinteger(lua, 42);
 ///     1
 /// }
@@ -452,7 +452,7 @@ where
 }
 
 // this function is called when Lua wants to call one of our functions
-extern "C" fn wrapper<T, A, R>(lua: LuaState) -> libc::c_int
+extern "C-unwind" fn wrapper<T, A, R>(lua: LuaState) -> libc::c_int
 where
     T: FnMutExt<A, Output = R>,
     // TODO(gmoshkin): these bounds are too strict, how do we loosen them?
@@ -525,7 +525,7 @@ where
         out: Option<R>,
     }
 
-    unsafe extern "C" fn trampoline<F, R>(l: LuaState) -> i32
+    unsafe extern "C-unwind" fn trampoline<F, R>(l: LuaState) -> i32
     where
         F: FnOnce(StaticLua) -> R,
     {
@@ -550,7 +550,7 @@ mod tests {
     fn c_function() {
         let lua = crate::Lua::new();
 
-        unsafe extern "C" fn return_42(lua: crate::LuaState) -> libc::c_int {
+        unsafe extern "C-unwind" fn return_42(lua: crate::LuaState) -> libc::c_int {
             ffi::lua_pushinteger(lua, 42);
             1
         }

tlua/src/lib.rs

@@ -989,7 +989,7 @@ impl TempLua {
         }
 
         // called whenever lua encounters an unexpected error.
-        extern "C" fn panic(lua: *mut ffi::lua_State) -> libc::c_int {
+        extern "C-unwind" fn panic(lua: *mut ffi::lua_State) -> libc::c_int {
             let err = unsafe { ffi::lua_tostring(lua, -1) };
             let err = unsafe { CStr::from_ptr(err) };
             let err = String::from_utf8(err.to_bytes().to_vec()).unwrap();

tlua/src/userdata.rs

@@ -42,7 +42,7 @@ where
 
     /// A callback for the "__gc" event. It checks if the value was moved out
     /// and if not it drops the value.
-    unsafe extern "C" fn wrap_gc<T>(lua: *mut ffi::lua_State) -> i32 {
+    unsafe extern "C-unwind" fn wrap_gc<T>(lua: *mut ffi::lua_State) -> i32 {
         let ud_ptr = ffi::lua_touserdata(lua, 1);
         let ud = ud_ptr
             .cast::<UDBox<T>>()
@@ -56,7 +56,7 @@ where
 
 // Called when an object inside Lua is being dropped.
 #[inline]
-extern "C" fn destructor_wrapper<T>(lua: *mut ffi::lua_State) -> libc::c_int {
+extern "C-unwind" fn destructor_wrapper<T>(lua: *mut ffi::lua_State) -> libc::c_int {
     unsafe {
         let obj = ffi::lua_touserdata(lua, -1);
         ptr::drop_in_place(obj as *mut TypeId);