Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-09 19:15:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

value: fix Vec<u8> TryFrom as arrays of U8 values are also possible

Browse Source
This commit is contained in:
Matt Bilker
2018-12-13 02:19:25 +00:00
parent 61954f016f
commit f6fd672154
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/value/mod.rs
View File

@@ -626,7 +626,18 @@ impl TryFrom<Value> for Vec<u8> {
type Error = KbinError;
fn try_from(value: Value) -> Result<Self, Self::Error> {
value.into_binary()
// An array of unsigned 8-bit integers can either be `Binary` or a literal
// array of unsigned 8-bit integers.
match value {
Value::Binary(data) => Ok(data),
Value::Array(node_type, values) => {
if node_type != StandardType::U8 {
return Err(KbinErrorKind::ValueTypeMismatch(StandardType::U8, Value::Array(node_type, values)).into());
}
values.iter().map(Value::as_u8).collect()
},
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::Binary, value).into()),
}
}
}
@@ -635,7 +646,16 @@ impl TryFrom<&Value> for Vec<u8> {
type Error = KbinError;
fn try_from(value: &Value) -> Result<Self, Self::Error> {
value.as_binary().map(Vec::from)
match value {
Value::Binary(ref data) => Ok(data.to_vec()),
Value::Array(ref node_type, ref values) => {
if *node_type != StandardType::U8 {
return Err(KbinErrorKind::ValueTypeMismatch(StandardType::U8, value.clone()).into());
}
values.iter().map(Value::as_u8).collect()
},
value => Err(KbinErrorKind::ValueTypeMismatch(StandardType::Binary, value.clone()).into()),
}
}
}