Skip to content
Closed
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
1 change: 0 additions & 1 deletion core/lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#![feature(try_trait)]
#![feature(proc_macro_hygiene)]
#![feature(crate_visibility_modifier)]
#![feature(label_break_value)]

#![recursion_limit="256"]

Expand Down
11 changes: 7 additions & 4 deletions core/lib/src/request/form/form.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,23 @@ impl<'f, T: FromForm<'f>> FromData<'f> for Form<T> {
) -> Transform<Outcome<Self::Owned, Self::Error>> {
use std::{cmp::min, io::Read};

let outcome = 'o: {
// This will not loop indefinitely, as we will always break on the first
// iteration. If the [`label_break_value`](https://git.io/rust-label-break-value)
// ever stabilizes, we can use that instead.
let outcome = loop {
if !request.content_type().map_or(false, |ct| ct.is_form()) {
warn_!("Form data does not have form content type.");
break 'o Forward(data);
break Forward(data);
}

let limit = request.limits().forms;
let mut stream = data.open().take(limit);
let mut form_string = String::with_capacity(min(4096, limit) as usize);
if let Err(e) = stream.read_to_string(&mut form_string) {
break 'o Failure((Status::InternalServerError, FormDataError::Io(e)));
break Failure((Status::InternalServerError, FormDataError::Io(e)));
}

break 'o Success(form_string);
break Success(form_string);
};

Transform::Borrowed(outcome)
Expand Down