robin/bitbuffer
1
0
Fork 0
mirror of https://codeberg.org/icewind/bitbuffer.git synced 2026-06-03 16:44:06 +02:00
Code Issues Releases Wiki Activity

fix pos when reading malformed utf8

Browse source
This commit is contained in:
Robin Appelman 2020-12-06 21:20:33 +01:00
commit 4d2ea4ee7c
5 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -125,7 +125,7 @@ pub enum BitError {
},
/// The read slice of bytes are not valid utf8
#[error(display = "The read slice of bytes are not valid utf8: {}", _0)]
Utf8Error(#[error(source)] Utf8Error),
Utf8Error(Utf8Error, usize),
/// The string that was requested to be written does not fit in the specified fixed length
#[error(
display = "The string that was requested to be written does not fit in the specified fixed length, string is {} bytes long, while a size of {} has been specified",
@ -142,7 +142,7 @@ pub enum BitError {
impl From<FromUtf8Error> for BitError {
fn from(err: FromUtf8Error) -> Self {
BitError::from(err.utf8_error())
BitError::Utf8Error(err.utf8_error(), err.as_bytes().len())
}
}

13
src/readbuffer.rs
View file

@ -587,9 +587,11 @@ where
.trim_end_matches(char::from(0))
.to_string(),
),
Cow::Borrowed(bytes) => {
Cow::Borrowed(std::str::from_utf8(bytes)?.trim_end_matches(char::from(0)))
}
Cow::Borrowed(bytes) => Cow::Borrowed(
std::str::from_utf8(bytes)
.map_err(|err| BitError::Utf8Error(err, bytes.len()))?
.trim_end_matches(char::from(0)),
),
};
Ok(string)
}
@ -597,7 +599,10 @@ where
let bytes = self.read_string_bytes(position)?;
let string = match bytes {
Cow::Owned(bytes) => Cow::Owned(String::from_utf8(bytes)?),
Cow::Borrowed(bytes) => Cow::Borrowed(std::str::from_utf8(bytes)?),
Cow::Borrowed(bytes) => Cow::Borrowed(
std::str::from_utf8(bytes)
.map_err(|err| BitError::Utf8Error(err, bytes.len()))?,
),
};
Ok(string)
}

4
src/readstream.rs
View file

@ -306,10 +306,10 @@ where
let result = self.buffer.read_string(self.pos, byte_len).map_err(|err| {
// still advance the stream on malformed utf8
if let BitError::Utf8Error(err) = &err {
if let BitError::Utf8Error(_, len) = &err {
self.pos += match byte_len {
Some(len) => len * 8,
None => min((err.valid_up_to() + 1) * 8, max_length),
None => min((len + 1) * 8, max_length * 8),
};
}
err