Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: fix a crashing issue in Error::ThrowAsJavaScriptException #902

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions napi-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,11 @@ inline void Error::ThrowAsJavaScriptException() const {

napi_status status = napi_throw(_env, Value());

if (status == napi_pending_exception) {
// The environment could be terminating.
return;
}

#ifdef NAPI_CPP_EXCEPTIONS
if (status != napi_ok) {
throw Error::New(_env);
Expand Down
62 changes: 62 additions & 0 deletions test/error.cc
Original file line number Diff line number Diff line change
@@ -1,9 +1,54 @@
#include <future>
#include "napi.h"

using namespace Napi;

namespace {

std::promise<void> promise_for_child_process_;
std::promise<void> promise_for_worker_thread_;

void ResetPromises(const CallbackInfo&) {
promise_for_child_process_ = std::promise<void>();
promise_for_worker_thread_ = std::promise<void>();
}

void WaitForWorkerThread(const CallbackInfo&) {
std::future<void> future = promise_for_worker_thread_.get_future();

std::future_status status = future.wait_for(std::chrono::seconds(5));

if (status != std::future_status::ready) {
Error::Fatal("WaitForWorkerThread", "status != std::future_status::ready");
}
}

void ReleaseAndWaitForChildProcess(const CallbackInfo& info,
const uint32_t index) {
if (info.Length() < index + 1) {
return;
}

if (!info[index].As<Boolean>().Value()) {
return;
}

promise_for_worker_thread_.set_value();

std::future<void> future = promise_for_child_process_.get_future();

std::future_status status = future.wait_for(std::chrono::seconds(5));

if (status != std::future_status::ready) {
Error::Fatal("ReleaseAndWaitForChildProcess",
"status != std::future_status::ready");
}
}

void ReleaseWorkerThread(const CallbackInfo&) {
promise_for_child_process_.set_value();
}

void DoNotCatch(const CallbackInfo& info) {
Function thrower = info[0].As<Function>();
thrower({});
Expand All @@ -18,16 +63,22 @@ void ThrowApiError(const CallbackInfo& info) {

void ThrowJSError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
throw Error::New(info.Env(), message);
}

void ThrowTypeError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
throw TypeError::New(info.Env(), message);
}

void ThrowRangeError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
throw RangeError::New(info.Env(), message);
}

Expand Down Expand Up @@ -83,16 +134,22 @@ void CatchAndRethrowErrorThatEscapesScope(const CallbackInfo& info) {

void ThrowJSError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
Error::New(info.Env(), message).ThrowAsJavaScriptException();
}

void ThrowTypeError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
TypeError::New(info.Env(), message).ThrowAsJavaScriptException();
}

void ThrowRangeError(const CallbackInfo& info) {
std::string message = info[0].As<String>().Utf8Value();

ReleaseAndWaitForChildProcess(info, 1);
RangeError::New(info.Env(), message).ThrowAsJavaScriptException();
}

Expand Down Expand Up @@ -187,6 +244,8 @@ void ThrowDefaultError(const CallbackInfo& info) {
Error::Fatal("ThrowDefaultError", "napi_get_named_property");
}

ReleaseAndWaitForChildProcess(info, 1);

// The macro creates a `Napi::Error` using the factory that takes only the
// env, however, it heeds the exception mechanism to be used.
NAPI_THROW_IF_FAILED_VOID(env, status);
Expand All @@ -209,5 +268,8 @@ Object InitError(Env env) {
Function::New(env, CatchAndRethrowErrorThatEscapesScope);
exports["throwFatalError"] = Function::New(env, ThrowFatalError);
exports["throwDefaultError"] = Function::New(env, ThrowDefaultError);
exports["resetPromises"] = Function::New(env, ResetPromises);
exports["waitForWorkerThread"] = Function::New(env, WaitForWorkerThread);
exports["releaseWorkerThread"] = Function::New(env, ReleaseWorkerThread);
return exports;
}
88 changes: 88 additions & 0 deletions test/error_terminating_environment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
'use strict';
const buildType = process.config.target_defaults.default_configuration;
const assert = require('assert');

// These tests ensure that Error types can be used in a terminating
// environment without triggering any fatal errors.

if (process.argv[2] === 'runInChildProcess') {
const binding_path = process.argv[3];
const index_for_test_case = Number(process.argv[4]);

const binding = require(binding_path);

// Use C++ promises to ensure the worker thread is terminated right
// before running the testable code in the binding.

binding.error.resetPromises()

const { Worker } = require('worker_threads');

const worker = new Worker(
__filename,
{
argv: [
'runInWorkerThread',
binding_path,
index_for_test_case,
]
}
);

binding.error.waitForWorkerThread()

worker.terminate();

binding.error.releaseWorkerThread()

return;
}

if (process.argv[2] === 'runInWorkerThread') {
const binding_path = process.argv[3];
const index_for_test_case = Number(process.argv[4]);

const binding = require(binding_path);

switch (index_for_test_case) {
case 0:
binding.error.throwJSError('test', true);
break;
case 1:
binding.error.throwTypeError('test', true);
break;
case 2:
binding.error.throwRangeError('test', true);
break;
case 3:
binding.error.throwDefaultError(false, true);
break;
case 4:
binding.error.throwDefaultError(true, true);
break;
default: assert.fail('Invalid index');
}

assert.fail('This should not be reachable');
}

test(`./build/${buildType}/binding.node`);
test(`./build/${buildType}/binding_noexcept.node`);

function test(bindingPath) {
const number_of_test_cases = 5;

for (let i = 0; i < number_of_test_cases; ++i) {
const child_process = require('./napi_child').spawnSync(
process.execPath,
[
__filename,
'runInChildProcess',
bindingPath,
i,
]
);

assert(child_process.status === 0, `Test case ${i} failed`);
}
}
1 change: 1 addition & 0 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ if (napiVersion < 6) {

if (majorNodeVersion < 12) {
testModules.splice(testModules.indexOf('objectwrap_worker_thread'), 1);
testModules.splice(testModules.indexOf('error_terminating_environment'), 1);
}

(async function() {
Expand Down