forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #718 from hyperium/715-buffer-grow-error

Browse Source 
fix(buffer): fix incorrect resizing of BufReader
This commit is contained in:
Sean McArthur
2016-01-04 15:22:00 -08:00
parent a4230eb510 3a18e72be6
commit 28b395d165
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/buffer.rs
View File

@@ -79,7 +79,7 @@ unsafe fn grow_zerofill(buf: &mut Vec<u8>, additional: usize) {
use std::ptr; use std::ptr;
let len = buf.len(); let len = buf.len();
buf.set_len(len + additional); buf.set_len(len + additional);
ptr::write_bytes(buf.as_mut_ptr(), 0, buf.len()); ptr::write_bytes(buf.as_mut_ptr().offset(len as isize), 0, buf.len());
} }
impl<R: Read> Read for BufReader<R> { impl<R: Read> Read for BufReader<R> {
@@ -151,4 +151,14 @@ mod tests {
assert_eq!(rdr.pos, 0); assert_eq!(rdr.pos, 0);
assert_eq!(rdr.cap, 0); assert_eq!(rdr.cap, 0);
} }
#[test]
fn test_resize() {
let raw = b"hello world";
let mut rdr = BufReader::with_capacity(&raw[..], 5);
rdr.read_into_buf().unwrap();
assert_eq!(rdr.get_buf(), b"hello");
rdr.read_into_buf().unwrap();
assert_eq!(rdr.get_buf(), b"hello world");
}
} }