n-api: Retain last code when getting error info

jasongin · Gabriel Schulhof · commit 726d5849777a · 2018-04-10T12:58:29.000-04:00
Unlike most N-API functions, `napi_get_last_error_info()` should not clear the last error code when successful, because a pointer to (not a copy of) the error info structure is returned via an out parameter. PR-URL: nodejs#13087 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -757,7 +757,7 @@ napi_status napi_get_last_error_info(napi_env env,
       error_messages[env->last_error.error_code];
 
   *result = &(env->last_error);
-  return napi_clear_last_error(env);
+  return napi_ok;
 }
 
 napi_status napi_create_function(napi_env env,
diff --git a/test/addons-napi/test_napi_status/test_napi_status.cc b/test/addons-napi/test_napi_status/test_napi_status.cc
@@ -10,6 +10,14 @@ napi_value createNapiError(napi_env env, napi_callback_info info) {
 
   NAPI_ASSERT(env, status != napi_ok, "Failed to produce error condition");
 
+  const napi_extended_error_info *error_info = 0;
+  NAPI_CALL(env, napi_get_last_error_info(env, &error_info));
+
+  NAPI_ASSERT(env, error_info->error_code == status,
+    "Last error info code should match last status");
+  NAPI_ASSERT(env, error_info->error_message,
+    "Last error info message should not be null");
+
   return nullptr;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ napi_status napi_get_last_error_info(napi_env env,`
`757`	`757`	`error_messages[env->last_error.error_code];`
`758`	`758`
`759`	`759`	`*result = &(env->last_error);`
`760`		`- return napi_clear_last_error(env);`
	`760`	`+ return napi_ok;`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`napi_status napi_create_function(napi_env env,`