DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: Verify with debug assertions that no FixedSizeBlock expects a multi-byte alignment (#198)

Browse source
This commit is contained in:
Chris Hennick 2024-06-21 17:03:44 -07:00
parent 26e6462a8d
commit 8bb3be02c1
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/spec.rs
View file

@ -1,10 +1,11 @@
#![macro_use]
use crate::result::{ZipError, ZipResult};
use core::mem;
use core::mem::align_of;
use memchr::memmem::FinderRev;
use std::io;
use std::io::prelude::*;
use std::mem;
use std::rc::Rc;
/// "Magic" header values used in the zip spec to locate metadata records.
@ -109,6 +110,10 @@ pub(crate) trait FixedSizeBlock: Sized + Copy {
return Err(ZipError::InvalidArchive("Block is wrong size"));
}
let block_ptr: *const Self = bytes.as_ptr().cast();
// If alignment could be more than 1, we'd have to use read_unaligned() below
debug_assert_eq!(align_of::<Self>(), 1);
let block = unsafe { block_ptr.read() }.from_le();
if block.magic() != Self::MAGIC {
return Err(Self::WRONG_MAGIC_ERROR);
@ -135,6 +140,10 @@ pub(crate) trait FixedSizeBlock: Sized + Copy {
fn serialize(self) -> Box<[u8]> {
/* TODO: use Box::new_zeroed() when stabilized! */
/* TODO: also consider using smallvec! */
// If alignment could be more than 1, we'd have to use write_unaligned() below
debug_assert_eq!(align_of::<Self>(), 1);
let mut out_block = vec![0u8; mem::size_of::<Self>()].into_boxed_slice();
let out_ptr: *mut Self = out_block.as_mut_ptr().cast();
unsafe {