From: Matt Corallo <git@bluematt.me>
Date: Wed, 25 Jul 2018 21:45:03 +0000 (-0400)
Subject: Fix fee addition overflow in get_route
X-Git-Tag: v0.0.12~366^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=158d0c16dc1a9b8ed0130661331bd07ca48d3c1e;p=rust-lightning

Fix fee addition overflow in get_route
---

diff --git a/src/ln/router.rs b/src/ln/router.rs
index f30eb7912..bbd9cdada 100644
--- a/src/ln/router.rs
+++ b/src/ln/router.rs
@@ -429,8 +429,9 @@ impl Router {
 				//TODO: Explore simply adding fee to hit htlc_minimum_msat
 				if $starting_fee_msat as u64 + final_value_msat > $directional_info.htlc_minimum_msat {
 					let proportional_fee_millions = ($starting_fee_msat + final_value_msat).checked_mul($directional_info.fee_proportional_millionths as u64);
-					if let Some(proportional_fee) = proportional_fee_millions {
-						let new_fee = $directional_info.fee_base_msat as u64 + proportional_fee / 1000000;
+					if let Some(new_fee) = proportional_fee_millions.and_then(|part| {
+							($directional_info.fee_base_msat as u64).checked_add(part / 1000000) })
+					{
 						let mut total_fee = $starting_fee_msat as u64;
 						let mut hm_entry = dist.entry(&$directional_info.src_node_id);
 						let old_entry = hm_entry.or_insert_with(|| {