From 2cbcaab23c6344bc9c8a7d52c424ef655f3c7700 Mon Sep 17 00:00:00 2001 From: Hardhat Chad Date: Tue, 2 Jul 2024 16:45:35 +0000 Subject: [PATCH] checked unpack --- api/src/loaders.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/api/src/loaders.rs b/api/src/loaders.rs index 998dca6..90f13ed 100644 --- a/api/src/loaders.rs +++ b/api/src/loaders.rs @@ -289,9 +289,7 @@ pub fn load_mint<'a, 'info>( return Err(ProgramError::UninitializedAccount); } - if Mint::unpack_unchecked(&info.data.borrow()).is_err() { - return Err(ProgramError::InvalidAccountData); - } + Mint::unpack(&info.data.borrow())?; if is_writable && !info.is_writable { return Err(ProgramError::InvalidAccountData); @@ -322,8 +320,7 @@ pub fn load_token_account<'a, 'info>( } let account_data = info.data.borrow(); - let account = spl_token::state::Account::unpack_unchecked(&account_data) - .or(Err(ProgramError::InvalidAccountData))?; + let account = spl_token::state::Account::unpack(&account_data)?; if account.mint.ne(&mint) { return Err(ProgramError::InvalidAccountData);