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.

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

Fix more recursive failures #68

Merged
merged 5 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
8 changes: 4 additions & 4 deletions flash-lso/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ categories = ["data-structures", "encoding", "parser-implementations"]

[dependencies]
nom = "7.1.3"
enumset = "1.1.3"
thiserror = "1.0.61"
serde = { version = "1.0.203", optional = true, features = ["derive", "rc"] }
enumset = "1.1.5"
thiserror = "1.0.63"
serde = { version = "1.0.210", optional = true, features = ["derive", "rc"] }

[dev-dependencies]
pretty_assertions = "1.4.0"
serde_json = "1.0.120"
serde_json = "1.0.128"
criterion = "0.5.1"

[[bench]]
Expand Down
11 changes: 9 additions & 2 deletions flash-lso/src/amf0/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ impl AMF0Decoder {
let (i, array_length) = be_u32(i)?;
map(
|i| self.parse_array_element(i),
move |elms: Vec<Element>| Rc::new(Value::ECMAArray(Vec::new(), elms, array_length)),
move |elms: Vec<Element>| {
Rc::new(Value::ECMAArray(
ObjectId::INVALID,
Vec::new(),
elms,
array_length,
))
},
)(i)
}

Expand Down Expand Up @@ -133,7 +140,7 @@ impl AMF0Decoder {
let (i, elements) =
many_m_n(length_usize, length_usize, |i| self.parse_single_element(i))(i)?;

Ok((i, Rc::new(Value::StrictArray(elements))))
Ok((i, Rc::new(Value::StrictArray(ObjectId::INVALID, elements))))
}

fn parse_array_element<'a>(&mut self, i: &'a [u8]) -> AMFResult<'a, Vec<Element>> {
Expand Down
4 changes: 2 additions & 2 deletions flash-lso/src/amf0/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ pub(crate) fn write_value<'a, 'b: 'a, W: Write + 'a>(
}
Value::Null => write_null_element(writer),
Value::Undefined => write_undefined_element(writer),
Value::StrictArray(a) => write_strict_array_element(writer, a.as_slice()),
Value::StrictArray(_id, a) => write_strict_array_element(writer, a.as_slice()),
Value::Date(d, tz) => write_date_element(writer, *d, *tz),
Value::Unsupported => write_unsupported_element(writer),
Value::XML(x, _string) => write_xml_element(writer, x),
Value::ECMAArray(dense, elems, elems_length) => {
Value::ECMAArray(_id, dense, elems, elems_length) => {
write_mixed_array(writer, dense, elems, *elems_length)
}
#[cfg(feature = "amf3")]
Expand Down
4 changes: 2 additions & 2 deletions flash-lso/src/amf0/writer/array_writer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::rc::Rc;

use crate::types::{Element, Reference, Value};
use crate::types::{Element, ObjectId, Reference, Value};

use super::{CacheKey, ObjWriter, ObjectWriter};

Expand Down Expand Up @@ -96,7 +96,7 @@ impl<'a, 'b> ArrayWriter<'a, 'b> {
pub fn commit<T: AsRef<str>>(self, name: T, length: u32) {
self.parent.add_element(
name.as_ref(),
Value::ECMAArray(Vec::new(), self.elements, length),
Value::ECMAArray(ObjectId::INVALID, Vec::new(), self.elements, length),
false,
);
}
Expand Down
Loading