|
| 1 | +diff -Naur a/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/src/primitives.rs b/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/src/primitives.rs |
| 2 | +--- a/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/src/primitives.rs 2021-04-25 17:00:00.000000000 -0700 |
| 3 | ++++ b/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/src/primitives.rs 2023-04-05 15:33:56.893718099 -0700 |
| 4 | +@@ -367,6 +367,16 @@ |
| 5 | + let entries: Vec<<T as FamStruct>::Entry> = |
| 6 | + Vec::deserialize(reader, version_map, app_version) |
| 7 | + .map_err(|ref err| VersionizeError::Deserialize(format!("{:?}", err)))?; |
| 8 | ++ if header.len() != entries.len() { |
| 9 | ++ let msg = format!( |
| 10 | ++ "Mismatch between length of FAM specified in FamStruct header ({}) \ |
| 11 | ++ and actual size of FAM ({})", |
| 12 | ++ header.len(), |
| 13 | ++ entries.len() |
| 14 | ++ ); |
| 15 | ++ |
| 16 | ++ return Err(VersionizeError::Deserialize(msg)); |
| 17 | ++ } |
| 18 | + // Construct the object from the array items. |
| 19 | + // Header(T) fields will be initialized by Default trait impl. |
| 20 | + let mut object = FamStructWrapper::from_entries(&entries) |
| 21 | +diff -Naur a/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/tests/test.rs b/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/tests/test.rs |
| 22 | +--- a/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/tests/test.rs 2021-04-25 17:00:00.000000000 -0700 |
| 23 | ++++ b/.cargo/registry/src/github.com-1ecc6299db9ec823/versionize-0.1.6/tests/test.rs 2023-04-05 15:34:57.145737780 -0700 |
| 24 | +@@ -1321,6 +1321,32 @@ |
| 25 | + type Message2FamStructWrapper = FamStructWrapper<Message2>; |
| 26 | + |
| 27 | + #[test] |
| 28 | ++fn test_deserialize_famstructwrapper_invalid_len() { |
| 29 | ++ let mut vm = VersionMap::new(); |
| 30 | ++ vm.new_version() |
| 31 | ++ .set_type_version(Message::type_id(), 2) |
| 32 | ++ .new_version() |
| 33 | ++ .set_type_version(Message::type_id(), 3) |
| 34 | ++ .new_version() |
| 35 | ++ .set_type_version(Message::type_id(), 4); |
| 36 | ++ |
| 37 | ++ // Create FamStructWrapper with len 2 |
| 38 | ++ let state = MessageFamStructWrapper::new(0).unwrap(); |
| 39 | ++ let mut buffer = [0; 256]; |
| 40 | ++ |
| 41 | ++ state.serialize(&mut buffer.as_mut_slice(), &vm, 2).unwrap(); |
| 42 | ++ |
| 43 | ++ // the `len` field of the header is the first serialized field. |
| 44 | ++ // Let's corrupt it by making it bigger than the actual number of serialized elements |
| 45 | ++ buffer[0] = 255; |
| 46 | ++ |
| 47 | ++ assert_eq!( |
| 48 | ++ MessageFamStructWrapper::deserialize(&mut buffer.as_slice(), &vm, 2).unwrap_err(), |
| 49 | ++ VersionizeError::Deserialize("Mismatch between length of FAM specified in FamStruct header (255) and actual size of FAM (0)".to_string()) |
| 50 | ++ ); |
| 51 | ++} |
| 52 | ++ |
| 53 | ++#[test] |
| 54 | + fn test_versionize_famstructwrapper() { |
| 55 | + let mut vm = VersionMap::new(); |
| 56 | + vm.new_version() |
0 commit comments