tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backup/archive_index.rs: correctly check for errors

This commit is contained in:
Dietmar Maurer 2019-01-10 11:19:54 +01:00
parent 23f68e53b4
commit 373ef4a504
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backup/archive_index.rs
View File

@ -244,7 +244,7 @@ impl <'a> crate::tools::BufferedReader for BufferedArchiveReader<'a> {
let next_idx = self.buffered_chunk_idx + 1; let next_idx = self.buffered_chunk_idx + 1;
let next_end = index.chunk_end(next_idx); let next_end = index.chunk_end(next_idx);
if offset < next_end { if offset < next_end {
self.buffer_chunk(next_idx); self.buffer_chunk(next_idx)?;
let buffer_offset = (offset - self.buffered_chunk_start) as usize; let buffer_offset = (offset - self.buffered_chunk_start) as usize;
return Ok(&self.read_buffer[buffer_offset..]); return Ok(&self.read_buffer[buffer_offset..]);
} }
@ -257,7 +257,7 @@ impl <'a> crate::tools::BufferedReader for BufferedArchiveReader<'a> {
let end_idx = index.index_entries - 1; let end_idx = index.index_entries - 1;
let end = index.chunk_end(end_idx); let end = index.chunk_end(end_idx);
let idx = index.binary_search(0, 0, end_idx, end, offset)?; let idx = index.binary_search(0, 0, end_idx, end, offset)?;
self.buffer_chunk(idx); self.buffer_chunk(idx)?;
} }
let buffer_offset = (offset - self.buffered_chunk_start) as usize; let buffer_offset = (offset - self.buffered_chunk_start) as usize;