Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid unlocking the response body while it is in an inconsistent state.

Browse source
This commit is contained in:
Ms2ger 2016-12-02 09:47:22 +01:00
parent be896712ac
commit 8a4a5c0cb5
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/net/http_loader.rs
View file

@ -42,7 +42,7 @@ use std::collections::HashSet;
use std::error::Error;
use std::io::{self, Read, Write};
use std::iter::FromIterator;
use std::mem::swap;
use std::mem;
use std::ops::Deref;
use std::rc::Rc;
use std::sync::{Arc, RwLock};
@ -1101,16 +1101,14 @@ fn http_network_fetch(request: Rc<Request>,
}
},
Ok(Data::Done) | Err(_) => {
let mut empty_vec = Vec::new();
let completed_body = match *res_body.lock().unwrap() {
let mut body = res_body.lock().unwrap();
let completed_body = match *body {
ResponseBody::Receiving(ref mut body) => {
// avoid cloning the body
swap(body, &mut empty_vec);
empty_vec
mem::replace(body, vec![])
},
_ => empty_vec,
_ => vec![],
};
*res_body.lock().unwrap() = ResponseBody::Done(completed_body);
*body = ResponseBody::Done(completed_body);
let _ = done_sender.send(Data::Done);
break;
}