Skip to content

Commit

Permalink
vm: don't abort process when stack space runs out
Browse files Browse the repository at this point in the history
Make less assumptions about what objects will be available when
vm context creation or error message printing fail because V8
runs out of JS stack space.

Ref: #6899
PR-URL: #6907
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
addaleax authored and Myles Borins committed Jul 12, 2016
1 parent 7d66752 commit b9dfdfe
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/node_contextify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ class ContextifyContext {

Local<Context> ctx = Context::New(env->isolate(), nullptr, object_template);

CHECK(!ctx.IsEmpty());
if (ctx.IsEmpty()) {
env->ThrowError("Could not instantiate context");
return Local<Context>();
}

ctx->SetSecurityToken(env->context()->GetSecurityToken());

// We need to tie the lifetime of the sandbox object with the lifetime of
Expand Down
26 changes: 26 additions & 0 deletions test/parallel/test-vm-low-stack-space.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
'use strict';
require('../common');
const assert = require('assert');
const vm = require('vm');

function a() {
try {
return a();
} catch (e) {
// Throw an exception as near to the recursion-based RangeError as possible.
return vm.runInThisContext('() => 42')();
}
}

assert.strictEqual(a(), 42);

function b() {
try {
return b();
} catch (e) {
// This writes a lot of noise to stderr, but it still works.
return vm.runInNewContext('() => 42')();
}
}

assert.strictEqual(b(), 42);

0 comments on commit b9dfdfe

Please sign in to comment.