---

yaml
---
r: 101643
b: refs/heads/master
c: 49ac48d
h: refs/heads/master
i:
  101641: 53bd278
  101639: d714dee
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 337e62e4d65e24682ba323b65283a59715a0c8af
+refs/heads/master: 49ac48db3fe2666751908668ba8e5ab16e2fb07a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/libstd/io/mem.rs

@@ -177,7 +177,11 @@ impl Seek for MemReader {
 
 impl Buffer for MemReader {
     fn fill<'a>(&'a mut self) -> IoResult<&'a [u8]> {
-        Ok(self.buf.slice_from(self.pos))
+        if self.pos < self.buf.len() {
+            Ok(self.buf.slice_from(self.pos))
+        } else {
+            Err(io::standard_error(io::EndOfFile))
+        }
     }
     fn consume(&mut self, amt: uint) { self.pos += amt; }
 }
@@ -308,7 +312,11 @@ impl<'a> Seek for BufReader<'a> {
 
 impl<'a> Buffer for BufReader<'a> {
     fn fill<'a>(&'a mut self) -> IoResult<&'a [u8]> {
-        Ok(self.buf.slice_from(self.pos))
+        if self.pos < self.buf.len() {
+            Ok(self.buf.slice_from(self.pos))
+        } else {
+            Err(io::standard_error(io::EndOfFile))
+        }
     }
     fn consume(&mut self, amt: uint) { self.pos += amt; }
 }
@@ -421,6 +429,10 @@ mod test {
         assert_eq!(reader.read(buf), Ok(3));
         assert_eq!(buf.slice(0, 3), [5, 6, 7]);
         assert!(reader.read(buf).is_err());
+        let mut reader = MemReader::new(~[0, 1, 2, 3, 4, 5, 6, 7]);
+        assert_eq!(reader.read_until(3).unwrap(), ~[0, 1, 2, 3]);
+        assert_eq!(reader.read_until(3).unwrap(), ~[4, 5, 6, 7]);
+        assert!(reader.read(buf).is_err());
     }
 
     #[test]
@@ -441,6 +453,10 @@ mod test {
         assert_eq!(reader.read(buf), Ok(3));
         assert_eq!(buf.slice(0, 3), [5, 6, 7]);
         assert!(reader.read(buf).is_err());
+        let mut reader = BufReader::new(in_buf);
+        assert_eq!(reader.read_until(3).unwrap(), ~[0, 1, 2, 3]);
+        assert_eq!(reader.read_until(3).unwrap(), ~[4, 5, 6, 7]);
+        assert!(reader.read(buf).is_err());
     }
 
     #[test]