gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runtime: checked math for Bank::withdraw (#16788)

Browse Source 
(cherry picked from commit be29568318)

# Conflicts:
#	runtime/src/bank.rs

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-04-24 00:25:41 +00:00
committed by GitHub
parent ff9573714b
commit 2ce6c86c2a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/src/bank.rs
View File

@ -4014,7 +4014,7 @@ impl Bank {
self.store_account(pubkey, new_account); self.store_account(pubkey, new_account);
} }
pub fn withdraw(&self, pubkey: &Pubkey, lamports: u64) -> Result<()> { fn withdraw(&self, pubkey: &Pubkey, lamports: u64) -> Result<()> {
match self.get_account(pubkey) { match self.get_account(pubkey) {
Some(mut account) => { Some(mut account) => {
let min_balance = match get_system_account_kind(&account) { let min_balance = match get_system_account_kind(&account) {
@ -4024,9 +4024,11 @@ impl Bank {
.minimum_balance(nonce::State::size()), .minimum_balance(nonce::State::size()),
_ => 0, _ => 0,
}; };
if lamports + min_balance > account.lamports {
return Err(TransactionError::InsufficientFundsForFee); lamports
} .checked_add(min_balance)
.filter(|required_balance| *required_balance <= account.lamports())
.ok_or(TransactionError::InsufficientFundsForFee)?;
account.lamports -= lamports; account.lamports -= lamports;
self.store_account(pubkey, &account); self.store_account(pubkey, &account);