X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser.rs;h=ba8a9fd0d3551efe8062e907f4d52d5f2b635d51;hb=ad4f16b3e60bbc074423639fe5cfdb9f7174e1e9;hp=47bdf04f8750ac8d2562f032c7232d997f36c3b4;hpb=e82318d374fc6dd8e0aec5155bb06bca432ae4b7;p=rust-lightning

diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index 47bdf04f..ba8a9fd0 100644
--- a/lightning/src/util/ser.rs
+++ b/lightning/src/util/ser.rs
@@ -502,14 +502,20 @@ impl<K, V> Writeable for HashMap<K, V>
 
 impl<K, V> Readable for HashMap<K, V>
 	where K: Readable + Eq + Hash,
-	      V: Readable
+	      V: MaybeReadable
 {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let len: u16 = Readable::read(r)?;
 		let mut ret = HashMap::with_capacity(len as usize);
 		for _ in 0..len {
-			ret.insert(K::read(r)?, V::read(r)?);
+			let k = K::read(r)?;
+			let v_opt = V::read(r)?;
+			if let Some(v) = v_opt {
+				if ret.insert(k, v).is_some() {
+					return Err(DecodeError::InvalidValue);
+				}
+			}
 		}
 		Ok(ret)
 	}