Proxmox/perlmod
5
0
Fork 0
mirror of git://git.proxmox.com/git/perlmod.git synced 2025-03-13 04:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix 'undef' deserialization

Browse Source 
Since it has 0 flags it wasn't recognized as a scalar, but
an unsupported "magic" value.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-02-15 14:53:57 +01:00
parent fa4d4a654c
commit e077d87d8c
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
perlmod/src/de.rs
View File

@ -64,7 +64,10 @@ impl<'deserializer> Deserializer<'deserializer> {
if let Value::Scalar(value) = &self.input {
match value.ty() {
Type::Scalar(_) => Ok(()),
Type::Other(_) => Error::fail("cannot deserialize weird magic perl values"),
Type::Other(other) => Err(Error(format!(
"cannot deserialize weird magic perl values ({})",
other
))),
// These are impossible as they are all handled by different Value enum types:
Type::Reference => Error::fail("Value::Scalar: containing a reference"),
Type::Array => Error::fail("Value::Scalar: containing an array"),
@ -98,6 +101,8 @@ impl<'deserializer> Deserializer<'deserializer> {
visitor.visit_f64(value.nv())
} else if flags.contains(Flags::INTEGER) {
visitor.visit_i64(value.iv() as i64)
} else if flags.is_empty() {
visitor.visit_none()
} else {
visitor.visit_unit()
}

23
perlmod/src/scalar.rs
View File

@ -194,15 +194,25 @@ impl ScalarRef {
} else {
let flags = ffi::RSPL_type_flags(self.sv());
if flags > 0xff {
panic!("bad C type returned");
// we may possibly get here via a `#[raw]` scalar reference (though not
// really?)
Type::Other(0)
//panic!("bad C type returned");
} else if flags != 0 {
// non-scalars will not have any flags:
Type::Scalar(Flags::from_bits(flags as u8).unwrap())
} else if ffi::RSPL_is_array(self.sv()) {
Type::Array
} else if ffi::RSPL_is_hash(self.sv()) {
Type::Hash
} else {
Type::Other(ffi::RSPL_svtype(self.sv()) as u8)
// but `undef` also has no flags, so:
let ty = ffi::RSPL_svtype(self.sv());
if ty == 0 {
Type::Scalar(Flags::empty())
} else {
Type::Other(ty as u8)
}
}
}
}
@ -370,13 +380,16 @@ impl serde::Serialize for Scalar {
serializer.serialize_f64(self.nv())
} else if flags.contains(Flags::INTEGER) {
serializer.serialize_i64(self.iv() as i64)
} else if flags.is_empty() {
serializer.serialize_none()
} else {
serializer.serialize_unit()
}
}
Type::Other(_) => Err(S::Error::custom(
"cannot deserialize weird magic perl values",
)),
Type::Other(other) => Err(S::Error::custom(format!(
"cannot serialize weird magic perl values ({})",
other
))),
// These are impossible as they are all handled by different Value enum types:
Type::Reference => Value::from(