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.

Sign up for GitHub

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

Allow deserialization of strings with unlimited size #43

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Allow deserialization of strings with unlimited size #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ciborium/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ is-it-maintained-open-issues = { repository = "enarx/ciborium" }

[dependencies]
ciborium-ll = { path = "../ciborium-ll", version = "0.2.0" }
ciborium-io = { path = "../ciborium-io", version = "0.2.0", features = ["alloc"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
ciborium-io = { path = "../ciborium-io", version = "0.2.0" }
serde = { version = "1.0", default-features = false, features = ["derive"] }

[dev-dependencies]
serde_bytes = "0.11"
Expand All @@ -31,5 +31,6 @@ rand = "0.8"
hex = "0.4"

[features]
default = ["std"]
default = ["std", "alloc"]
alloc = ["ciborium-io/alloc", "serde/alloc"]
std = ["ciborium-io/std", "serde/std"]
64 changes: 54 additions & 10 deletions ciborium/src/de/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,25 @@ where
Err(..) => self.deserialize_i128(visitor),
},

Header::Bytes(len) => match len {
Some(len) if len <= self.scratch.len() => self.deserialize_bytes(visitor),
_ => self.deserialize_byte_buf(visitor),
},
Header::Bytes(len) => {
#[cfg(not(feature = "alloc"))]
match len {
Some(len) if len <= self.scratch.len() => self.deserialize_bytes(visitor),
_ => self.deserialize_byte_buf(visitor),
}
#[cfg(feature = "alloc")]
self.deserialize_byte_buf(visitor)
}

Header::Text(len) => match len {
Some(len) if len <= self.scratch.len() => self.deserialize_str(visitor),
_ => self.deserialize_string(visitor),
},
Header::Text(len) => {
#[cfg(not(feature = "alloc"))]
match len {
Some(len) if len <= self.scratch.len() => self.deserialize_str(visitor),
_ => self.deserialize_string(visitor),
}
#[cfg(feature = "alloc")]
self.deserialize_string(visitor)
}

Header::Array(..) => self.deserialize_seq(visitor),
Header::Map(..) => self.deserialize_map(visitor),
Expand Down Expand Up @@ -324,7 +334,12 @@ where
return match self.decoder.pull()? {
Header::Tag(..) => continue,

Header::Text(Some(len)) if len <= self.scratch.len() => {
Header::Text(Some(len)) => {
#[cfg(not(feature = "alloc"))]
if len > self.scratch.len() {
return Err(Error::Syntax(offset));
}

self.decoder.read_exact(&mut self.scratch[..len])?;

match core::str::from_utf8(&self.scratch[..len]) {
Expand Down Expand Up @@ -363,10 +378,17 @@ where

fn deserialize_bytes<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value, Self::Error> {
loop {
let offset = self.decoder.offset();

return match self.decoder.pull()? {
Header::Tag(..) => continue,

Header::Bytes(Some(len)) if len <= self.scratch.len() => {
Header::Bytes(Some(len)) => {
#[cfg(not(feature = "alloc"))]
if len > self.scratch.len() {
return Err(Error::Syntax(offset));
}

self.decoder.read_exact(&mut self.scratch[..len])?;
visitor.visit_bytes(&self.scratch[..len])
}
Expand Down Expand Up @@ -803,7 +825,10 @@ pub fn from_reader<'de, T: de::Deserialize<'de>, R: Read>(reader: R) -> Result<T
where
R::Error: core::fmt::Debug,
{
#[cfg(not(feature = "alloc"))]
let mut scratch = [0; 4096];
#[cfg(feature = "alloc")]
let mut scratch = Vec::new();

let mut reader = Deserializer {
decoder: reader.into(),
Expand All @@ -813,3 +838,22 @@ where

T::deserialize(&mut reader)
}

/// Deserializes as CBOR from a type with [`impl ciborium_io::Read`](ciborium_io::Read) and a buffer as `&mut [u8]`
#[cfg(not(feature = "alloc"))]
#[inline]
pub fn from_reader_with_buffer<'de, T: de::Deserialize<'de>, R: Read>(
reader: R,
buf: &mut [u8],
) -> Result<T, Error<R::Error>>
where
R::Error: core::fmt::Debug,
{
let mut reader = Deserializer {
decoder: reader.into(),
scratch: buf,
recurse: 256,
};

T::deserialize(&mut reader)
}