From 1dfddf81c08dac3412c82d91013cfaac82aa07e8 Mon Sep 17 00:00:00 2001 From: Johnathan Sharratt Date: Fri, 10 Mar 2023 16:44:54 +1100 Subject: [PATCH] No longer causing a panic when globals are set to null in JS --- lib/api/src/js/externals/global.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/api/src/js/externals/global.rs b/lib/api/src/js/externals/global.rs index 5e2f93b70..d9be955f6 100644 --- a/lib/api/src/js/externals/global.rs +++ b/lib/api/src/js/externals/global.rs @@ -70,19 +70,19 @@ impl Global { let ty = self.handle.ty; let raw = match ty.ty { Type::I32 => RawValue { - i32: value.as_f64().unwrap() as _, + i32: value.as_f64().unwrap_or_default() as _, }, Type::I64 => RawValue { - i64: value.as_f64().unwrap() as _, + i64: value.as_f64().unwrap_or_default() as _, }, Type::F32 => RawValue { - f32: value.as_f64().unwrap() as _, + f32: value.as_f64().unwrap_or_default() as _, }, Type::F64 => RawValue { - f64: value.as_f64().unwrap(), + f64: value.as_f64().unwrap_or_default(), }, Type::V128 => RawValue { - u128: value.as_f64().unwrap() as _, + u128: value.as_f64().unwrap_or_default() as _, }, Type::FuncRef => { unimplemented!();