From 524bccdf6aa20ee4ba76dc7291d77b4c98fa7e28 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Wed, 1 Feb 2023 06:41:04 -0800 Subject: fix(napi): return node globalThis from napi_get_global (#17613) Fixes https://github.com/denoland/deno/issues/17587 --- cli/napi/js_native_api.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cli/napi/js_native_api.rs') diff --git a/cli/napi/js_native_api.rs b/cli/napi/js_native_api.rs index 62ac40159..aefe8dd0d 100644 --- a/cli/napi/js_native_api.rs +++ b/cli/napi/js_native_api.rs @@ -1718,12 +1718,12 @@ fn napi_get_element( #[napi_sym::napi_sym] fn napi_get_global(env: *mut Env, result: *mut napi_value) -> Result { check_env!(env); - let env = unsafe { &mut *env }; + check_arg!(env, result); - let context = &mut env.scope().get_current_context(); - let global = context.global(&mut env.scope()); - let value: v8::Local = global.into(); + let value: v8::Local = + transmute::, v8::Local>((*env).global); *result = value.into(); + napi_clear_last_error(env); Ok(()) } -- cgit v1.2.3