From a6af97f76c13913d5d6ec38cf8b839ea369df14f Mon Sep 17 00:00:00 2001 From: Gabriel Schulhof Date: Sat, 8 Apr 2017 16:12:13 +0300 Subject: [PATCH] napi: initialize and check status properly Initialize status to napi_generic_failure and only check it after having made an actual N-API call. This fixes up 8fbace163afbd61b5efc57cf94414be904bf0188. Backport-PR-URL: https://github.com/nodejs/node/pull/19447 PR-URL: https://github.com/nodejs/node/pull/12283 Ref: https://github.com/nodejs/node/pull/12279 Reviewed-By: Refael Ackermann --- src/node_api.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/node_api.cc b/src/node_api.cc index c6d825230fbcb6..b61157a8f317ff 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -2164,7 +2164,7 @@ napi_status napi_instanceof(napi_env env, if (env->has_instance_available) { napi_value value, js_result, has_instance = nullptr; - napi_status status; + napi_status status = napi_generic_failure; napi_valuetype value_type; // Get "Symbol" from the global object @@ -2187,14 +2187,12 @@ napi_status napi_instanceof(napi_env env, if (value_type == napi_symbol) { env->has_instance.Reset(env->isolate, v8impl::V8LocalValueFromJsValue(value)); - if (status != napi_ok) return status; has_instance = value; } } } else { has_instance = v8impl::JsValueFromV8LocalValue( v8::Local::New(env->isolate, env->has_instance)); - if (status != napi_ok) return status; } if (has_instance) {