X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=lightning-c-bindings%2Fsrc%2Fc_types%2Fmod.rs;h=472d4d0d15482e30c031720f0ee4de708d53daef;hp=3d6f08accc3926d3153ecd45aab38498ce0c5f0e;hb=dd5bf474af6c806b20c26f4f2b751f3226a94dfd;hpb=fc3bfd9a0b3cf846bd9c3187bb1b0363611f0708 diff --git a/lightning-c-bindings/src/c_types/mod.rs b/lightning-c-bindings/src/c_types/mod.rs index 3d6f08a..472d4d0 100644 --- a/lightning-c-bindings/src/c_types/mod.rs +++ b/lightning-c-bindings/src/c_types/mod.rs @@ -14,7 +14,7 @@ use bitcoin::secp256k1::recovery::RecoverableSignature as SecpRecoverableSignatu use bitcoin::bech32; use std::convert::TryInto; // Bindings need at least rustc 1.34 - +use core::ffi::c_void; use std::io::{Cursor, Read}; // TODO: We should use core2 here when we support no_std #[repr(C)] @@ -404,8 +404,8 @@ pub struct ThreeBytes { /** The three bytes */ pub data: [u8; 3], } pub struct FourBytes { /** The four bytes */ pub data: [u8; 4], } #[derive(Clone)] #[repr(C)] -/// A 10-byte byte array. -pub struct TenBytes { /** The ten bytes */ pub data: [u8; 10], } +/// A 12-byte byte array. +pub struct TwelveBytes { /** The twelve bytes */ pub data: [u8; 12], } #[derive(Clone)] #[repr(C)] /// A 16-byte byte array. @@ -618,6 +618,18 @@ pub(crate) mod ObjOps { } } +#[cfg(test_mod_pointers)] +#[no_mangle] +/// This function exists for memory safety testing purposes. It should never be used in production +/// code +pub extern "C" fn __unmangle_inner_ptr(ptr: *const c_void) -> *const c_void { + if ptr as usize == 1 { + core::ptr::null() + } else { + unsafe { ptr.cast::().sub(4096).cast::() } + } +} + pub(crate) struct SmartPtr { ptr: *mut T, }