Skip to content
Permalink
Browse files

module: pass v8::Object to linked module initialization function

Fixes: #4756
PR-URL: #4771
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Rod Vagg <r@va.gg>
  • Loading branch information...
kaero authored and jasnell committed Jan 19, 2016
1 parent 61fe86b commit 71470a8e45af4ee65292327e5648fcf566324b0f
Showing with 9 additions and 6 deletions.
  1. +9 −6 src/node.cc
@@ -2407,27 +2407,30 @@ static void Binding(const FunctionCallbackInfo<Value>& args) {
static void LinkedBinding(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());

Local<String> module = args[0]->ToString(env->isolate());
Local<String> module_name = args[0]->ToString(env->isolate());

Local<Object> cache = env->binding_cache_object();
Local<Value> exports_v = cache->Get(module);
Local<Value> exports_v = cache->Get(module_name);

if (exports_v->IsObject())
return args.GetReturnValue().Set(exports_v.As<Object>());

node::Utf8Value module_v(env->isolate(), module);
node_module* mod = get_linked_module(*module_v);
node::Utf8Value module_name_v(env->isolate(), module_name);
node_module* mod = get_linked_module(*module_name_v);

if (mod == nullptr) {
char errmsg[1024];
snprintf(errmsg,
sizeof(errmsg),
"No such module was linked: %s",
*module_v);
*module_name_v);
return env->ThrowError(errmsg);
}

Local<Object> module = Object::New(env->isolate());
Local<Object> exports = Object::New(env->isolate());
Local<String> exports_prop = String::NewFromUtf8(env->isolate(), "exports");
module->Set(exports_prop, exports);

if (mod->nm_context_register_func != nullptr) {
mod->nm_context_register_func(exports,
@@ -2440,7 +2443,7 @@ static void LinkedBinding(const FunctionCallbackInfo<Value>& args) {
return env->ThrowError("Linked module has no declared entry point.");
}

cache->Set(module, exports);
cache->Set(module_name, module->Get(exports_prop));

args.GetReturnValue().Set(exports);
}

0 comments on commit 71470a8

Please sign in to comment.
You can’t perform that action at this time.