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

Jump to bottom

Fix clamped capacity to be divided by element size #1549

Merged
merged 3 commits into from
Dec 28, 2022
Merged

Fix clamped capacity to be divided by element size #1549

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64216b8
Fix clamped capacity to be divided by element size
jkugelman Sep 12, 2022
04f5dbb
Update src/multi/mod.rs
Geal Dec 28, 2022
d463616
Merge branch 'main' into clamp-capacity-wording
Geal Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/multi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use core::num::NonZeroUsize;
///
/// This does not affect correctness. Nom will always read the full number
/// of elements regardless of the capacity cap.
const MAX_INITIAL_CAPACITY: usize = 65536;
const MAX_INITIAL_CAPACITY_BYTES: usize = 65536;
Geal marked this conversation as resolved.
Show resolved Hide resolved

/// Repeats the embedded parser until it fails
/// and returns the results in a `Vec`.
Expand Down Expand Up @@ -373,7 +373,8 @@ where
return Err(Err::Failure(E::from_error_kind(input, ErrorKind::ManyMN)));
}

let mut res = crate::lib::std::vec::Vec::with_capacity(min.clamp(0, MAX_INITIAL_CAPACITY));
let max_initial_capacity = MAX_INITIAL_CAPACITY_BYTES / crate::lib::std::mem::size_of::<O>();
let mut res = crate::lib::std::vec::Vec::with_capacity(min.min(max_initial_capacity));
for count in 0..max {
let len = input.input_len();
match parse.parse(input.clone()) {
Expand Down Expand Up @@ -540,7 +541,8 @@ where
{
move |i: I| {
let mut input = i.clone();
let mut res = crate::lib::std::vec::Vec::with_capacity(count.clamp(0, MAX_INITIAL_CAPACITY));
let max_initial_capacity = MAX_INITIAL_CAPACITY_BYTES / crate::lib::std::mem::size_of::<O>();
let mut res = crate::lib::std::vec::Vec::with_capacity(count.min(max_initial_capacity));

for _ in 0..count {
let input_ = input.clone();
Expand Down