Skip to content

Commit

Permalink
napi: initialize and check status properly
Browse files Browse the repository at this point in the history
Initialize status to napi_generic_failure and only check it after
having made an actual N-API call.

This fixes up 8fbace1.

PR-URL: #12283
Ref: #12279
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information
Gabriel Schulhof authored and refack committed Apr 8, 2017
1 parent 14749f9 commit afd5966
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/node_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2162,7 +2162,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
Expand All @@ -2185,14 +2185,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<v8::Value>::New(env->isolate, env->has_instance));
if (status != napi_ok) return status;
}

if (has_instance) {
Expand Down

0 comments on commit afd5966

Please sign in to comment.