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.

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

Never return an error after a partial write #32107

Merged
merged 2 commits into from
Mar 10, 2016
Merged
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
34 changes: 32 additions & 2 deletions src/libstd/io/buffered.rs
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,10 @@ impl<W: Write> Write for LineWriter<W> {
match memchr::memrchr(b'\n', buf) {
Some(i) => {
let n = try!(self.inner.write(&buf[..i + 1]));
if n != i + 1 { return Ok(n) }
try!(self.inner.flush());
if n != i + 1 || self.inner.flush().is_err() {
// Do not return errors on partial writes.
return Ok(n);
}
self.inner.write(&buf[i + 1..]).map(|i| n + i)
}
None => self.inner.write(buf),
Expand Down Expand Up @@ -982,6 +984,34 @@ mod tests {
assert_eq!(v, []);
}

#[test]
fn test_line_buffer_fail_flush() {
// Issue #32085
struct FailFlushWriter<'a>(&'a mut Vec<u8>);

impl<'a> Write for FailFlushWriter<'a> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.0.extend_from_slice(buf);
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
Err(io::Error::new(io::ErrorKind::Other, "flush failed"))
}
}

let mut buf = Vec::new();
{
let mut writer = LineWriter::new(FailFlushWriter(&mut buf));
let to_write = b"abc\ndef";
if let Ok(written) = writer.write(to_write) {
assert!(written < to_write.len(), "didn't flush on new line");
// PASS
return;
}
}
assert!(buf.is_empty(), "write returned an error but wrote data");
}

#[test]
fn test_line_buffer() {
let mut writer = LineWriter::new(Vec::new());
Expand Down