From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 12 Nov 2021 17:59:18 +0000 (+0000)
Subject: Merge pull request #1143 from TheBlueMatt/2021-10-no-payment-id-leaks
X-Git-Tag: v0.0.104~39
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1beccf188d157cc3147d348a348ad8d2e5d5fe59;p=rust-lightning

Merge pull request #1143 from TheBlueMatt/2021-10-no-payment-id-leaks

Fix a minor memory leak on PermanentFailure mon errs when sending
---

1beccf188d157cc3147d348a348ad8d2e5d5fe59
diff --cc lightning/src/ln/channelmanager.rs
index a5f84abfd,444d443fa..5aebf3dbf
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@@ -2261,20 -2251,11 +2265,23 @@@ impl<Signer: Sign, M: Deref, T: Deref, 
  			}
  		}
  		if has_err && has_ok {
 -			Err(PaymentSendFailure::PartialFailure(results))
 +			Err(PaymentSendFailure::PartialFailure {
 +				results,
 +				payment_id,
 +				failed_paths_retry: if pending_amt_unsent != 0 {
 +					if let Some(payee) = &route.payee {
 +						Some(RouteParameters {
 +							payee: payee.clone(),
 +							final_value_msat: pending_amt_unsent,
 +							final_cltv_expiry_delta: max_unsent_cltv_delta,
 +						})
 +					} else { None }
 +				} else { None },
 +			})
  		} else if has_err {
+ 			// If we failed to send any paths, we shouldn't have inserted the new PaymentId into
+ 			// our `pending_outbound_payments` map at all.
+ 			debug_assert!(self.pending_outbound_payments.lock().unwrap().get(&payment_id).is_none());
  			Err(PaymentSendFailure::AllFailedRetrySafe(results.drain(..).map(|r| r.unwrap_err()).collect()))
  		} else {
  			Ok(payment_id)