bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix metadata encoding and decoding to use the right length

Browse source
This commit is contained in:
Rune Tynan 2023-02-13 13:39:28 -05:00
parent dce3947110
commit 7df53d5e18
No known key found for this signature in database
GPG key ID: 7ECC932F8B2C731E
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_metadata/src/locator.rs
View file

@ -799,14 +799,14 @@ fn get_metadata_section<'p>(
}
// Length of the compressed stream - this allows linkers to pad the section if they want
let usize_len = core::mem::size_of::<u32>();
let Ok(len_bytes) = <[u8; 4]>::try_from(&buf[header_len..cmp::min(header_len + usize_len, buf.len())]) else {
let u32_len = core::mem::size_of::<u32>();
let Ok(len_bytes) = <[u8; 4]>::try_from(&buf[header_len..cmp::min(header_len + u32_len, buf.len())]) else {
return Err(MetadataError::LoadFailure("invalid metadata length found".to_string()));
};
let compressed_len = u32::from_be_bytes(len_bytes) as usize;
// Header is okay -> inflate the actual metadata
let compressed_bytes = &buf[header_len..compressed_len + header_len];
let compressed_bytes = &buf[(header_len + u32_len)..(compressed_len + header_len + u32_len)];
debug!("inflating {} bytes of compressed metadata", compressed_bytes.len());
// Assume the decompressed data will be at least the size of the compressed data, so we
// don't have to grow the buffer as much.