checked unpack

This commit is contained in:
Hardhat Chad
2024-07-02 16:45:35 +00:00
parent b2c3006242
commit 2cbcaab23c

View File

@@ -289,9 +289,7 @@ pub fn load_mint<'a, 'info>(
return Err(ProgramError::UninitializedAccount); return Err(ProgramError::UninitializedAccount);
} }
if Mint::unpack_unchecked(&info.data.borrow()).is_err() { Mint::unpack(&info.data.borrow())?;
return Err(ProgramError::InvalidAccountData);
}
if is_writable && !info.is_writable { if is_writable && !info.is_writable {
return Err(ProgramError::InvalidAccountData); return Err(ProgramError::InvalidAccountData);
@@ -322,8 +320,7 @@ pub fn load_token_account<'a, 'info>(
} }
let account_data = info.data.borrow(); let account_data = info.data.borrow();
let account = spl_token::state::Account::unpack_unchecked(&account_data) let account = spl_token::state::Account::unpack(&account_data)?;
.or(Err(ProgramError::InvalidAccountData))?;
if account.mint.ne(&mint) { if account.mint.ne(&mint) {
return Err(ProgramError::InvalidAccountData); return Err(ProgramError::InvalidAccountData);