lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some panics in deadline checking. (#87)

Browse Source 
time_until_deadline had a time of check to time of use problem - the
deadline could pass between a call to checked_duration_since and the
evaluation of `deadline - now` (which panics if the result would be
negative). Resolve that by flipping the order of
checked_duration_since's arguments and using the result rather than
ignoring it.

Also there were three places that called deadline - now(), which could
panic. Replace those with time_until_deadline().
This commit is contained in:
Jacob Hoffman-Andrews
2020-06-23 23:45:18 -07:00
committed by GitHub
parent 2d6747717d
commit a85f4c037e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/stream.rs
View File

@@ -81,12 +81,12 @@ impl Read for DeadlineStream {
// then. Otherwise return a TimedOut error. // then. Otherwise return a TimedOut error.
fn time_until_deadline(deadline: Instant) -> IoResult<Duration> { fn time_until_deadline(deadline: Instant) -> IoResult<Duration> {
let now = Instant::now(); let now = Instant::now();
match now.checked_duration_since(deadline) { match deadline.checked_duration_since(now) {
Some(_) => Err(IoError::new( None => Err(IoError::new(
ErrorKind::TimedOut, ErrorKind::TimedOut,
"timed out reading response", "timed out reading response",
)), )),
None => Ok(deadline - now), Some(duration) => Ok(duration),
} }
} }
@@ -394,7 +394,7 @@ pub(crate) fn connect_host(unit: &Unit, hostname: &str, port: u16) -> Result<Tcp
// Setting it to None will disable the native system timeout // Setting it to None will disable the native system timeout
if let Some(deadline) = deadline { if let Some(deadline) = deadline {
stream stream
.set_read_timeout(Some(deadline - Instant::now())) .set_read_timeout(Some(time_until_deadline(deadline)?))
.ok(); .ok();
} else if unit.timeout_read > 0 { } else if unit.timeout_read > 0 {
stream stream
@@ -406,7 +406,7 @@ pub(crate) fn connect_host(unit: &Unit, hostname: &str, port: u16) -> Result<Tcp
if let Some(deadline) = deadline { if let Some(deadline) = deadline {
stream stream
.set_write_timeout(Some(deadline - Instant::now())) .set_write_timeout(Some(time_until_deadline(deadline)?))
.ok(); .ok();
} else if unit.timeout_write > 0 { } else if unit.timeout_write > 0 {
stream stream
@@ -523,7 +523,9 @@ fn connect_socks5(
let (lock, cvar) = &*master_signal; let (lock, cvar) = &*master_signal;
let done = lock.lock().unwrap(); let done = lock.lock().unwrap();
let done_result = cvar.wait_timeout(done, deadline - Instant::now()).unwrap(); let done_result = cvar
.wait_timeout(done, time_until_deadline(deadline)?)
.unwrap();
let done = done_result.0; let done = done_result.0;
if *done { if *done {
rx.recv().unwrap()? rx.recv().unwrap()?