Fix potential as_usize overflow when casting from U256 in miner

openethereum · Jul 26, 2018 · 4589ff5 · 4589ff5
1 parent 5795d33
commit 4589ff5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
@@ -417,7 +417,7 @@ impl Miner {
 		let max_transactions = if min_tx_gas.is_zero() {
 			usize::max_value()
 		} else {
-			MAX_SKIPPED_TRANSACTIONS.saturating_add((*open_block.block().header().gas_limit() / min_tx_gas).as_u64() as usize)
+			MAX_SKIPPED_TRANSACTIONS.saturating_add(cmp::min(*open_block.block().header().gas_limit() / min_tx_gas, usize::max_value()).as_usize())
 		};
 
 		let pending: Vec<Arc<_>> = self.transaction_queue.pending(