mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #23036 - gterzian:fix_range_request, r=jdm
Fix substraction with overflow in range request <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #23030 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23036) <!-- Reviewable:end -->
This commit is contained in:
commit
858f919388
1 changed files with 17 additions and 1 deletions
|
@ -401,6 +401,10 @@ fn handle_range_request(
|
|||
// whose body is in the ResponseBody::Receiving state.
|
||||
(&(Bound::Included(beginning), Bound::Included(end)), Some(ref complete_resource)) => {
|
||||
if let ResponseBody::Done(ref body) = *complete_resource.body.lock().unwrap() {
|
||||
if end == u64::max_value() {
|
||||
// Prevent overflow on the addition below.
|
||||
return None;
|
||||
}
|
||||
let b = beginning as usize;
|
||||
let e = end as usize + 1;
|
||||
let requested = body.get(b..e);
|
||||
|
@ -428,7 +432,7 @@ fn handle_range_request(
|
|||
},
|
||||
_ => continue,
|
||||
};
|
||||
if res_beginning - 1 < beginning && res_end + 1 > end {
|
||||
if res_beginning <= beginning && res_end >= end {
|
||||
let resource_body = &*partial_resource.body.lock().unwrap();
|
||||
let requested = match resource_body {
|
||||
&ResponseBody::Done(ref body) => {
|
||||
|
@ -474,6 +478,10 @@ fn handle_range_request(
|
|||
} else {
|
||||
continue;
|
||||
};
|
||||
if total == 0 {
|
||||
// Prevent overflow in the below operations from occuring.
|
||||
continue;
|
||||
};
|
||||
if res_beginning < beginning && res_end == total - 1 {
|
||||
let resource_body = &*partial_resource.body.lock().unwrap();
|
||||
let requested = match resource_body {
|
||||
|
@ -519,6 +527,14 @@ fn handle_range_request(
|
|||
} else {
|
||||
continue;
|
||||
};
|
||||
if !(total >= res_beginning) ||
|
||||
!(total >= res_end) ||
|
||||
offset == 0 ||
|
||||
offset == u64::max_value()
|
||||
{
|
||||
// Prevent overflow in the below operations from occuring.
|
||||
continue;
|
||||
}
|
||||
if (total - res_beginning) > (offset - 1) && (total - res_end) < offset + 1 {
|
||||
let resource_body = &*partial_resource.body.lock().unwrap();
|
||||
let requested = match resource_body {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue