Persistent<Context> GetV8Context();
static Local<Object> NewInstance();
+ static bool InstanceOf(Handle<Value> value);
protected:
}
+bool WrappedContext::InstanceOf(Handle<Value> value) {
+ return !value.IsEmpty() && constructor_template->HasInstance(value);
+}
+
+
Handle<Value> WrappedContext::New(const Arguments& args) {
HandleScope scope;
}
const int sandbox_index = input_flag == compileCode ? 1 : 0;
- if (context_flag == userContext && args.Length() < (sandbox_index + 1)) {
+ if (context_flag == userContext
+ && !WrappedContext::InstanceOf(args[sandbox_index]))
+ {
return ThrowException(Exception::TypeError(
String::New("needs a 'context' argument.")));
}
var common = require('../common');
var assert = require('assert');
-var Script = require('vm').Script;
+var vm = require('vm');
+var Script = vm.Script;
var script = new Script('"passed";');
common.debug('run in a new empty context');
// Issue GH-227:
Script.runInNewContext('', null, 'some.js');
+
+// GH-558, non-context argument segfaults / raises assertion
+function isTypeError(o) {
+ return o instanceof TypeError;
+}
+
+[undefined, null, 0, 0.0, '', {}, []].forEach(function(e) {
+ assert.throws(function() { script.runInContext(e); }, isTypeError);
+ assert.throws(function() { vm.runInContext('', e); }, isTypeError);
+});