diff options
| author | Gabriel Schulhof <gabriel.schulhof@intel.com> | 2017-04-08 16:12:13 +0300 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2017-04-08 11:43:05 -0400 |
| commit | afd5966fa9a874ebb958518633b70b6af4f78b8f (patch) | |
| tree | 3356ba28bb340b94dbdda8158ae045c8c75b32e9 | |
| parent | 14749f9eaffaa18eb2acfccfaa691329ae7d8ff4 (diff) | |
| download | android-node-v8-afd5966fa9a874ebb958518633b70b6af4f78b8f.tar.gz android-node-v8-afd5966fa9a874ebb958518633b70b6af4f78b8f.tar.bz2 android-node-v8-afd5966fa9a874ebb958518633b70b6af4f78b8f.zip | |
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.
PR-URL: https://github.com/nodejs/node/pull/12283
Ref: https://github.com/nodejs/node/pull/12279
Reviewed-By: Refael Ackermann <refack@gmail.com>
| -rw-r--r-- | src/node_api.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/node_api.cc b/src/node_api.cc index cac4c113dc..1e7651c426 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -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 @@ -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) { |