Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/cursor_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,20 @@ pub trait WriteExt {
impl<R: Read + Seek> ReadExt for R {
#[inline]
fn read_string(&mut self) -> Result<String, Error> {
let start_position = self.stream_position()?;
match self.read_fstring()? {
Some(str) => Ok(str),
None => Err(DeserializeError::InvalidString(0, self.stream_position()?))?,
None => Err(DeserializeError::InvalidString(0, start_position))?,
}
}

#[inline]
fn read_fstring(&mut self) -> Result<Option<String>, Error> {
let start_position = self.stream_position()?;
let len = self.read_i32::<LittleEndian>()?;

if !(-131072..=131072).contains(&len) {
Err(DeserializeError::InvalidString(
len,
self.stream_position()?,
))?
Err(DeserializeError::InvalidString(len, start_position))?
} else if len == 0 {
Ok(None)
} else if len < 0 {
Expand Down
2 changes: 1 addition & 1 deletion tests/gvas_tests/test_cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fn test_read_string() -> Result<(), Error> {
// Null
let mut cursor = Cursor::new(vec![0u8; 4]);
let string = cursor.read_string().expect_err("Expected err").to_string();
assert_eq!(string, "Invalid string size 0 at position 0x4");
assert_eq!(string, "Invalid string size 0 at position 0x0");

// Missing null terminator
let mut cursor = Cursor::new(vec![1u8, 0u8, 0u8, 0u8, b't']);
Expand Down
Loading