matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1349 from matthiasbeyer/libimagentryref/fixes

Browse source 
Fix: Allocating of buffer does not work as expected with Vec::with_ca…
This commit is contained in:
Matthias Beyer 2018-03-21 18:04:37 +01:00 committed by GitHub
commit 3d7be3a1e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/entry/libimagentryref/src/generators/mod.rs
View file

@ -205,8 +205,19 @@ macro_rules! make_sha_mod {
.open(path)
.map_err(RE::from)
.and_then(|mut file| {
let mut buffer = Vec::with_capacity(n);
let _ = file.read_exact(&mut buffer)?;
let mut buffer = vec![0; n];
debug!("Allocated {} bytes", buffer.capacity());
match file.read_exact(&mut buffer) {
Ok(_) => { /* yay */ Ok(()) },
Err(e) => if e.kind() == ::std::io::ErrorKind::UnexpectedEof {
debug!("Ignoring unexpected EOF before {} bytes were read", n);
Ok(())
} else {
Err(e)
}
}?;
let buffer = String::from_utf8(buffer)?;
$hashingimpl(buffer)
})