Skip to content

Commit

Permalink
Add function to get nul-terminated strings from memory
Browse files Browse the repository at this point in the history
Fixes #1086.

Signed-off-by: Stephan Renatus <[email protected]>
  • Loading branch information
srenatus committed Dec 20, 2019
1 parent 957bfd6 commit 36226fa
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion lib/runtime-core/src/memory/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
memory::Memory,
types::{ValueType, WasmExternType},
};
use std::{cell::Cell, fmt, marker::PhantomData, mem};
use std::{cell::Cell, convert::TryInto, fmt, marker::PhantomData, mem};

/// Array.
pub struct Array;
Expand Down Expand Up @@ -137,6 +137,17 @@ impl<T: Copy + ValueType> WasmPtr<T, Array> {
let slice: &[u8] = unsafe { std::slice::from_raw_parts(ptr, str_len as usize) };
std::str::from_utf8(slice).ok()
}

/// Get a UTF-8 string representation of this `WasmPtr`, where the string is nul-terminated.
/// Note that this does not account for UTF-8 strings that _contain_ nul themselves,
/// [`get_utf8_string`] has to be used for those.
pub fn get_utf8_string_nul_terminated<'a>(self, memory: &'a Memory) -> Option<&'a str> {
memory.view::<u8>()[(self.offset as usize)..]
.iter()
.map(|cell| cell.get())
.position(|byte| byte == 0)
.and_then(|length| self.get_utf8_string(memory, length.try_into().unwrap()))
}
}

unsafe impl<T: Copy, Ty> WasmExternType for WasmPtr<T, Ty> {
Expand Down

0 comments on commit 36226fa

Please sign in to comment.