Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

serde_v8: fix pointer size assumptions #15613

Merged
merged 1 commit into from Aug 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions serde_v8/magic/bytestring.rs
Expand Up @@ -5,6 +5,8 @@ use crate::Error;
use smallvec::SmallVec;
use std::mem::size_of;

const USIZE2X: usize = size_of::<usize>() * 2;

#[derive(
PartialEq,
Eq,
Expand All @@ -18,14 +20,15 @@ use std::mem::size_of;
)]
#[as_mut(forward)]
#[as_ref(forward)]
pub struct ByteString(SmallVec<[u8; 16]>);
pub struct ByteString(SmallVec<[u8; USIZE2X]>);
impl_magic!(ByteString);

// const-assert that Vec<u8> and SmallVec<[u8; 16]> have a same size.
// const-assert that Vec<u8> and SmallVec<[u8; size_of::<usize>() * 2]> have a same size.
// Note from https://docs.rs/smallvec/latest/smallvec/#union -
// smallvec can still be larger than Vec if the inline buffer is
// larger than two machine words.
const _: () = assert!(size_of::<Vec<u8>>() == size_of::<SmallVec<[u8; 16]>>());
const _: () =
assert!(size_of::<Vec<u8>>() == size_of::<SmallVec<[u8; USIZE2X]>>());

impl ToV8 for ByteString {
fn to_v8<'a>(
Expand Down
4 changes: 2 additions & 2 deletions serde_v8/magic/transl8.rs
Expand Up @@ -105,13 +105,13 @@ pub(crate) unsafe fn opaque_recv<T: ?Sized>(ptr: &T) -> u64 {

/// Transmutes an "opaque" ptr back into a reference
pub(crate) unsafe fn opaque_deref<'a, T>(ptr: u64) -> &'a T {
std::mem::transmute(ptr)
std::mem::transmute(ptr as usize)
}

/// Transmutes & copies the value from the "opaque" ptr
/// NOTE: takes ownership & requires other end to forget its ownership
pub(crate) unsafe fn opaque_take<T>(ptr: u64) -> T {
std::mem::transmute_copy::<T, T>(std::mem::transmute(ptr))
std::mem::transmute_copy::<T, T>(std::mem::transmute(ptr as usize))
}

macro_rules! impl_magic {
Expand Down