fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-03 10:51:09 +00:00
Code Issues Projects Releases Wiki Activity

Shifting the unsafe responsibility a bit

Browse Source
This commit is contained in:
Pauan 2019-07-18 22:21:48 +02:00
parent ca15a59ace
commit 544ec49e02
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/convert/slices.rs
View File

@ -128,17 +128,14 @@ vectors! {
cfg_if! { cfg_if! {
if #[cfg(feature = "enable-interning")] { if #[cfg(feature = "enable-interning")] {
#[inline] #[inline]
fn get_cached_str(x: &str) -> Option<WasmSlice> { fn unsafe_get_cached_str(x: &str) -> Option<WasmSlice> {
// This is safe because the JsValue is immediately looked up in the heap and
// then returned, so use-after-free cannot occur.
//
// This uses 0 for the ptr as an indication that it is a JsValue and not a str. // This uses 0 for the ptr as an indication that it is a JsValue and not a str.
crate::cache::intern::unsafe_get_str(x).map(|x| WasmSlice { ptr: 0, len: x }) crate::cache::intern::unsafe_get_str(x).map(|x| WasmSlice { ptr: 0, len: x })
} }
} else { } else {
#[inline] #[inline]
fn get_cached_str(_x: &str) -> Option<WasmSlice> { fn unsafe_get_cached_str(_x: &str) -> Option<WasmSlice> {
None None
} }
} }
@ -175,7 +172,9 @@ if_std! {
#[inline] #[inline]
fn into_abi(self) -> Self::Abi { fn into_abi(self) -> Self::Abi {
get_cached_str(&self).unwrap_or_else(|| self.into_bytes().into_abi()) // This is safe because the JsValue is immediately looked up in the heap and
// then returned, so use-after-free cannot occur.
unsafe_get_cached_str(&self).unwrap_or_else(|| self.into_bytes().into_abi())
} }
} }
@ -202,7 +201,9 @@ impl<'a> IntoWasmAbi for &'a str {
#[inline] #[inline]
fn into_abi(self) -> Self::Abi { fn into_abi(self) -> Self::Abi {
get_cached_str(self).unwrap_or_else(|| self.as_bytes().into_abi()) // This is safe because the JsValue is immediately looked up in the heap and
// then returned, so use-after-free cannot occur.
unsafe_get_cached_str(self).unwrap_or_else(|| self.as_bytes().into_abi())
} }
} }