From d0f5cd6a069e6a416e58b4ece456d134135b11d3 Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Sun, 8 May 2022 18:03:00 -0300 Subject: fix(core): avoid panic on non-string Error.name (#14529) Fixes #14518 --- core/error.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/error.rs b/core/error.rs index 045dd5a15..2ba053802 100644 --- a/core/error.rs +++ b/core/error.rs @@ -164,7 +164,7 @@ fn get_property<'a>( object.get(scope, key.into()) } -#[derive(serde::Deserialize)] +#[derive(Default, serde::Deserialize)] pub(crate) struct NativeJsError { pub name: Option, pub message: Option, @@ -196,7 +196,7 @@ impl JsError { let exception: v8::Local = exception.try_into().unwrap(); let cause = get_property(scope, exception, "cause"); let e: NativeJsError = - serde_v8::from_v8(scope, exception.into()).unwrap(); + serde_v8::from_v8(scope, exception.into()).unwrap_or_default(); // Get the message by formatting error.name and error.message. let name = e.name.clone().unwrap_or_else(|| "Error".to_string()); let message_prop = e.message.clone().unwrap_or_else(|| "".to_string()); -- cgit v1.2.3