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

src/pxar/decoder.rs: read_link has to read filename before entry. 

The offset points to the start of the item, which is the filename

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-09-09 18:27:30 +02:00 committed by Dietmar Maurer
parent 7eb9848ba7
commit 3710b23db5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pxar/decoder.rs
View File

@ -371,8 +371,13 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
/// Read the target of a hardlink in the archive. /// Read the target of a hardlink in the archive.
pub fn read_link(&mut self, offset: u64) -> Result<(PathBuf, PxarEntry), Error> { pub fn read_link(&mut self, offset: u64) -> Result<(PathBuf, PxarEntry), Error> {
self.seek(SeekFrom::Start(offset))?; self.seek(SeekFrom::Start(offset))?;
let mut header: PxarHeader = self.inner.read_item()?; let mut header: PxarHeader = self.inner.read_item()?;
if header.htype != PXAR_FILENAME {
bail!("Expected PXAR_FILENAME, encountered 0x{:x?}", header.htype);
}
let _filename = self.inner.read_filename(header.size)?;
header = self.inner.read_item()?;
check_ca_header::<PxarEntry>(&header, PXAR_ENTRY)?; check_ca_header::<PxarEntry>(&header, PXAR_ENTRY)?;
let entry: PxarEntry = self.inner.read_item()?; let entry: PxarEntry = self.inner.read_item()?;