Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-10 05:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish the data filed initialization of cpio entry

Browse Source
This commit is contained in:
LI Qing 2023-03-06 14:36:13 +08:00 committed by Tate, Hongliang Tian
parent 0435902579
commit c227c1e765
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/libs/cpio-decoder/src/lib.rs
View File

@ -106,7 +106,7 @@ pub struct CpioEntry<'a> {
impl<'a> CpioEntry<'a> { impl<'a> CpioEntry<'a> {
fn new(bytes: &'a [u8]) -> Result<Self> { fn new(bytes: &'a [u8]) -> Result<Self> {
let (metadata, name, data_offset) = { let (metadata, name, data) = {
let header = Header::new(bytes)?; let header = Header::new(bytes)?;
let name = { let name = {
let bytes_remain = &bytes[HEADER_LEN..]; let bytes_remain = &bytes[HEADER_LEN..];
@ -123,15 +123,21 @@ impl<'a> CpioEntry<'a> {
} else { } else {
FileMetadata::new(header)? FileMetadata::new(header)?
}; };
let data = {
let data_size = metadata.size as usize;
if data_size == 0 {
&[]
} else {
let data_offset = align_up(HEADER_LEN + name.len() + 1, 4);
if data_offset + data_size > bytes.len() {
return Err(Error::BufferShortError);
}
&bytes[data_offset..data_offset + data_size]
}
};
(metadata, name, align_up(HEADER_LEN + name.len() + 1, 4)) (metadata, name, data)
}; };
let data_size = metadata.size as usize;
let bytes_remain = &bytes[data_offset..];
if bytes_remain.len() < data_size {
return Err(Error::BufferShortError);
}
let data = &bytes_remain[..data_size];
Ok(Self { Ok(Self {
metadata, metadata,
name, name,
@ -159,7 +165,7 @@ impl<'a> CpioEntry<'a> {
} }
fn archive_offset(&self) -> usize { fn archive_offset(&self) -> usize {
align_up(HEADER_LEN + self.name.len() + 1, 4) + align_up(self.metadata.size as usize, 4) align_up(HEADER_LEN + self.name.len() + 1, 4) + align_up(self.data.len(), 4)
} }
} }