mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 15:02:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #25 from TheBlueMatt/master

Browse source 
Fix channel_target crash fp
This commit is contained in:
Matt Corallo 2018-05-10 10:56:22 -04:00 • committed by GitHub
commit 4a9d3a5c0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fuzz/fuzz_targets/channel_target.rs
View file

@ -158,7 +158,7 @@ pub fn do_test(data: &[u8]) {
macro_rules! return_err {
($expr: expr) => {
match $expr {
Ok(_) => {},
Ok(r) => r,
Err(_) => return,
}
}
@ -278,10 +278,14 @@ pub fn do_test(data: &[u8]) {
9 => {
let shutdown = decode_msg_with_len16!(msgs::Shutdown, 32, 1);
return_err!(channel.shutdown(&fee_est, &shutdown));
if channel.is_shutdown() { return; }
},
10 => {
let closing_signed = decode_msg!(msgs::ClosingSigned, 32+8+64);
return_err!(channel.closing_signed(&fee_est, &closing_signed));
if return_err!(channel.closing_signed(&fee_est, &closing_signed)).1.is_some() {
assert!(channel.is_shutdown());
return;
}
},
_ => return,
}

6
src/ln/channel.rs
View file

@ -608,7 +608,7 @@ impl Channel {
ins
};
let mut txouts: Vec<(TxOut, Option<HTLCOutputInCommitment>)> = Vec::new();
let mut txouts: Vec<(TxOut, Option<HTLCOutputInCommitment>)> = Vec::with_capacity(self.pending_htlcs.len() + 2);
let dust_limit_satoshis = if local { self.our_dust_limit_satoshis } else { self.their_dust_limit_satoshis };
let mut remote_htlc_total_msat = 0;
@ -699,8 +699,8 @@ impl Channel {
transaction_utils::sort_outputs(&mut txouts);
let mut outputs: Vec<TxOut> = Vec::new();
let mut htlcs_used: Vec<HTLCOutputInCommitment> = Vec::new();
let mut outputs: Vec<TxOut> = Vec::with_capacity(txouts.len());
let mut htlcs_used: Vec<HTLCOutputInCommitment> = Vec::with_capacity(txouts.len());
for (idx, out) in txouts.drain(..).enumerate() {
outputs.push(out.0);
if let Some(out_htlc) = out.1 {