Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix f32 type conversion to be safe #350

Merged
merged 3 commits into from
Mar 30, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion rustler/src/types/primitive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ impl_number_transcoder!(i8, i32, enif_make_int, enif_get_int);
impl_number_transcoder!(u8, u32, enif_make_uint, enif_get_uint);
impl_number_transcoder!(i16, i32, enif_make_int, enif_get_int);
impl_number_transcoder!(u16, u32, enif_make_uint, enif_get_uint);
impl_number_transcoder!(f32, f64, enif_make_double, enif_get_double);
impl_number_transcoder!(usize, u64, enif_make_uint64, enif_get_uint64);
impl_number_transcoder!(isize, i64, enif_make_int64, enif_get_int64);

Expand All @@ -60,3 +59,21 @@ impl<'a> Decoder<'a> for bool {
atom::decode_bool(term)
}
}

impl Encoder for f32 {
fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
f64::from(*self).encode(env)
}
}
impl<'a> Decoder<'a> for f32 {
fn decode(term: Term) -> NifResult<f32> {
let res: f64 = term.decode()?;
let res = res as f32;
evnu marked this conversation as resolved.
Show resolved Hide resolved
// Values bigger than f32 are coerced as infinity
if res.is_finite() {
Ok(res)
} else {
Err(Error::BadArg)
}
}
}