1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes: https://github.com/nodejs/node/issues/4756
PR-URL: https://github.com/nodejs/node/pull/4771
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Rod Vagg <r@va.gg>
This commit is contained in:
Phillip Kovalev 2016-01-20 00:52:16 +03:00 committed by James M Snell
parent 61fe86b560
commit 71470a8e45
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node.cc
View File

@ -2407,27 +2407,30 @@ static void Binding(const FunctionCallbackInfo<Value>& args) {
static void LinkedBinding(const FunctionCallbackInfo<Value>& args) { static void LinkedBinding(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate()); 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<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()) if (exports_v->IsObject())
return args.GetReturnValue().Set(exports_v.As<Object>()); return args.GetReturnValue().Set(exports_v.As<Object>());
node::Utf8Value module_v(env->isolate(), module); node::Utf8Value module_name_v(env->isolate(), module_name);
node_module* mod = get_linked_module(*module_v); node_module* mod = get_linked_module(*module_name_v);
if (mod == nullptr) { if (mod == nullptr) {
char errmsg[1024]; char errmsg[1024];
snprintf(errmsg, snprintf(errmsg,
sizeof(errmsg), sizeof(errmsg),
"No such module was linked: %s", "No such module was linked: %s",
*module_v); *module_name_v);
return env->ThrowError(errmsg); return env->ThrowError(errmsg);
} }
Local<Object> module = Object::New(env->isolate());
Local<Object> exports = 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) { if (mod->nm_context_register_func != nullptr) {
mod->nm_context_register_func(exports, 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."); 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); args.GetReturnValue().Set(exports);
} }