Fix fuzztarget insert_combine hash-collision panic

[rust-lightning] / src / ln / channelmonitor.rs

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index ae8f4f4a668f2ca007b2e03394a26725fe827d78..ffc9ed26fdaa60a0f81375ce88588f2f4aa8f18d 100644 (file)
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -423,7 +423,9 @@ impl ChannelMonitor {
 
        pub fn insert_combine(&mut self, mut other: ChannelMonitor) -> Result<(), HandleError> {
                if self.funding_txo.is_some() {
-                       if other.funding_txo.is_some() && other.funding_txo.as_ref().unwrap() != self.funding_txo.as_ref().unwrap() {
+                       // We should be able to compare the entire funding_txo, but in fuzztarget its trivially
+                       // easy to collide the funding_txo hash and have a different scriptPubKey.
+                       if other.funding_txo.is_some() && other.funding_txo.as_ref().unwrap().0 != self.funding_txo.as_ref().unwrap().0 {
                                return Err(HandleError{err: "Funding transaction outputs are not identical!", action: None});
                        }
                } else {