apply this fix to Vec<T> as well

Author: tomleavy

mls-rs-codec/src/lib.rs

@@ -51,7 +51,7 @@ pub enum Error {
     #[cfg_attr(feature = "std", error("Expected UTF-8 string"))]
     Utf8,
     #[cfg_attr(feature = "std", error("Invalid map content"))]
-    InvalidMapContent,
+    InvalidContent,
     #[cfg_attr(feature = "std", error("mls codec error: {0}"))]
     Custom(u8),
 }

mls-rs-codec/src/map.rs

@@ -48,7 +48,7 @@ where
                 let value = V::mls_decode(data)?;
 
                 if data.len() == before || items.insert(key, value).is_some() {
-                    return Err(crate::Error::InvalidMapContent);
+                    return Err(crate::Error::InvalidContent);
                 }
             }
 
@@ -92,7 +92,7 @@ where
                 let value = V::mls_decode(data)?;
 
                 if data.len() == before || items.insert(key, value).is_some() {
-                    return Err(crate::Error::InvalidMapContent);
+                    return Err(crate::Error::InvalidContent);
                 }
             }
 
@@ -164,7 +164,7 @@ mod tests {
     #[test]
     fn hashmap_zero_length_structure() {
         let res = HashMap::<[u8; 0], [u8; 0]>::mls_decode(&mut &[0x01, 0xff][..]);
-        assert_matches!(res, Err(crate::Error::InvalidMapContent))
+        assert_matches!(res, Err(crate::Error::InvalidContent))
     }
 
     #[cfg(feature = "std")]
@@ -177,7 +177,7 @@ mod tests {
             .unwrap();
 
         let res = HashMap::<u8, u8>::mls_decode(&mut &*encoded);
-        assert_matches!(res, Err(crate::Error::InvalidMapContent))
+        assert_matches!(res, Err(crate::Error::InvalidContent))
     }
 
     #[test]
@@ -189,13 +189,13 @@ mod tests {
             .unwrap();
 
         let res = BTreeMap::<u8, u8>::mls_decode(&mut &*encoded);
-        assert_matches!(res, Err(crate::Error::InvalidMapContent))
+        assert_matches!(res, Err(crate::Error::InvalidContent))
     }
 
     #[test]
     fn btree_map_zero_length_structure() {
         let res = BTreeMap::<[u8; 0], [u8; 0]>::mls_decode(&mut &[0x01, 0xff][..]);
-        assert_matches!(res, Err(crate::Error::InvalidMapContent))
+        assert_matches!(res, Err(crate::Error::InvalidContent))
     }
 
     #[cfg(feature = "std")]

mls-rs-codec/src/vec.rs

@@ -53,7 +53,14 @@ where
             let mut items = Vec::new();
 
             while !data.is_empty() {
-                items.push(T::mls_decode(data)?);
+                let before = data.len();
+                let value = T::mls_decode(data)?;
+
+                if data.len() == before {
+                    return Err(crate::Error::InvalidContent);
+                }
+
+                items.push(value);
             }
 
             Ok(items)
@@ -97,4 +104,10 @@ mod tests {
             Err(Error::UnexpectedEOF)
         );
     }
+
+    #[test]
+    fn vec_zero_length_structure() {
+        let res = Vec::<[u8; 0]>::mls_decode(&mut &[0x01, 0xff][..]);
+        assert_matches!(res, Err(crate::Error::InvalidContent))
+    }
 }