blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes lifetimes on AppendVec::get_type() (#31401)

This commit is contained in:
Brooks 2023-04-28 15:27:22 -04:00 committed by GitHub
parent 7474404539
commit f86dc35471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/src/append_vec.rs
View File

@ -484,7 +484,7 @@ impl AppendVec {
/// Return a reference to the type at `offset` if its data doesn't overrun the internal buffer. /// Return a reference to the type at `offset` if its data doesn't overrun the internal buffer.
/// Otherwise return None. Also return the offset of the first byte after the requested data /// Otherwise return None. Also return the offset of the first byte after the requested data
/// that falls on a 64-byte boundary. /// that falls on a 64-byte boundary.
fn get_type<'a, T>(&self, offset: usize) -> Option<(&'a T, usize)> { fn get_type<T>(&self, offset: usize) -> Option<(&T, usize)> {
let (data, next) = self.get_slice(offset, mem::size_of::<T>())?; let (data, next) = self.get_slice(offset, mem::size_of::<T>())?;
let ptr: *const T = data.as_ptr() as *const T; let ptr: *const T = data.as_ptr() as *const T;
//UNSAFE: The cast is safe because the slice is aligned and fits into the memory //UNSAFE: The cast is safe because the slice is aligned and fits into the memory
@ -495,10 +495,10 @@ impl AppendVec {
/// Return stored account metadata for the account at `offset` if its data doesn't overrun /// Return stored account metadata for the account at `offset` if its data doesn't overrun
/// the internal buffer. Otherwise return None. Also return the offset of the first byte /// the internal buffer. Otherwise return None. Also return the offset of the first byte
/// after the requested data that falls on a 64-byte boundary. /// after the requested data that falls on a 64-byte boundary.
pub fn get_account<'a>(&'a self, offset: usize) -> Option<(StoredAccountMeta<'a>, usize)> { pub fn get_account(&self, offset: usize) -> Option<(StoredAccountMeta, usize)> {
let (meta, next): (&'a StoredMeta, _) = self.get_type(offset)?; let (meta, next): (&StoredMeta, _) = self.get_type(offset)?;
let (account_meta, next): (&'a AccountMeta, _) = self.get_type(next)?; let (account_meta, next): (&AccountMeta, _) = self.get_type(next)?;
let (hash, next): (&'a Hash, _) = self.get_type(next)?; let (hash, next): (&Hash, _) = self.get_type(next)?;
let (data, next) = self.get_slice(next, meta.data_len as usize)?; let (data, next) = self.get_slice(next, meta.data_len as usize)?;
let stored_size = next - offset; let stored_size = next - offset;
Some(( Some((
@ -514,7 +514,7 @@ impl AppendVec {
)) ))
} }
fn get_account_meta<'a>(&self, offset: usize) -> Option<&'a AccountMeta> { fn get_account_meta(&self, offset: usize) -> Option<&AccountMeta> {
// Skip over StoredMeta data in the account // Skip over StoredMeta data in the account
let offset = offset.checked_add(mem::size_of::<StoredMeta>())?; let offset = offset.checked_add(mem::size_of::<StoredMeta>())?;
// u64_align! does an unchecked add for alignment. Check that it won't cause an overflow. // u64_align! does an unchecked add for alignment. Check that it won't cause an overflow.