n-api: napi_make_callback error handling

Updated error handling to return `napi_pending_exception` when the target of the callback call throws.
nodejs · Mar 20, 2018 · aadf3a8 · aadf3a8
1 parent b7d8e8f
commit aadf3a8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/node_api_jsrt.cc b/src/node_api_jsrt.cc
@@ -2159,8 +2159,14 @@ napi_status napi_make_callback(napi_env env,
     node::MakeCallback(isolate, v8recv, v8func, argc, v8argv,
                        *node_async_context);
 
+  bool hasException;
+  CHECK_JSRT(JsHasException(&hasException));
+  if (hasException) {
+    return napi_set_last_error(napi_pending_exception);
+  }
+
   if (v8result.IsEmpty()) {
-      return napi_set_last_error(napi_generic_failure);
+    return napi_set_last_error(napi_generic_failure);
   }
 
   if (result != nullptr) {