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

src: fix addon loader regression

Browse Source 
Fix a regression that was introduced in commit a38b9178 by removing the
bad check.  Also rearrange the addon loading logic to ensure that the
list of pending addons remains in a consistent state when the shared
object fails to load; in particular, when an addon self-registers first,
then hits a dynamic linker error in a later constructor.

Fixes the following asserting when loading a .node shared object:

    node: ../src/node.cc:1944: void node::node_module_register(void*):
    Assertion `(modpending) != (nullptr)' failed.

Fixes strongloop/strongops#233.

PR-URL: https://github.com/iojs/io.js/pull/154
Reviewed-By: Ryan Graham <ryan@strongloop.com>
This commit is contained in:
Ben Noordhuis 2014-12-11 15:29:52 +01:00
parent 370e821424
commit a60056df3c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/node.cc
View File

@ -1939,9 +1939,6 @@ extern "C" void node_module_register(void* m) {
mp->nm_link = modlist_linked; mp->nm_link = modlist_linked;
modlist_linked = mp; modlist_linked = mp;
} else { } else {
// Once node::Init was called we can only register dynamic modules.
// See DLOpen.
CHECK_NE(modpending, nullptr);
modpending = mp; modpending = mp;
} }
} }
@ -1980,9 +1977,10 @@ typedef void (UV_DYNAMIC* extInit)(Handle<Object> exports);
// cache that's a plain C list or hash table that's shared across contexts? // cache that's a plain C list or hash table that's shared across contexts?
void DLOpen(const FunctionCallbackInfo<Value>& args) { void DLOpen(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
struct node_module* mp;
uv_lib_t lib; uv_lib_t lib;
CHECK_EQ(modpending, nullptr);
if (args.Length() < 2) { if (args.Length() < 2) {
env->ThrowError("process.dlopen takes exactly 2 arguments."); env->ThrowError("process.dlopen takes exactly 2 arguments.");
return; return;
@ -1990,11 +1988,15 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
Local<Object> module = args[0]->ToObject(); // Cast Local<Object> module = args[0]->ToObject(); // Cast
node::Utf8Value filename(args[1]); // Cast node::Utf8Value filename(args[1]); // Cast
const bool is_dlopen_error = uv_dlopen(*filename, &lib);
Local<String> exports_string = env->exports_string(); // Objects containing v14 or later modules will have registered themselves
Local<Object> exports = module->Get(exports_string)->ToObject(); // on the pending list. Activate all of them now. At present, only one
// module per object is supported.
node_module* const mp = modpending;
modpending = nullptr;
if (uv_dlopen(*filename, &lib)) { if (is_dlopen_error) {
Local<String> errmsg = OneByteString(env->isolate(), uv_dlerror(&lib)); Local<String> errmsg = OneByteString(env->isolate(), uv_dlerror(&lib));
#ifdef _WIN32 #ifdef _WIN32
// Windows needs to add the filename into the error message // Windows needs to add the filename into the error message
@ -2004,14 +2006,6 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
return; return;
} }
/*
* Objects containing v14 or later modules will have registered themselves
* on the pending list. Activate all of them now. At present, only one
* module per object is supported.
*/
mp = modpending;
modpending = nullptr;
if (mp == nullptr) { if (mp == nullptr) {
env->ThrowError("Module did not self-register."); env->ThrowError("Module did not self-register.");
return; return;
@ -2034,6 +2028,9 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
mp->nm_link = modlist_addon; mp->nm_link = modlist_addon;
modlist_addon = mp; modlist_addon = mp;
Local<String> exports_string = env->exports_string();
Local<Object> exports = module->Get(exports_string)->ToObject();
if (mp->nm_context_register_func != nullptr) { if (mp->nm_context_register_func != nullptr) {
mp->nm_context_register_func(exports, module, env->context(), mp->nm_priv); mp->nm_context_register_func(exports, module, env->context(), mp->nm_priv);
} else if (mp->nm_register_func != nullptr) { } else if (mp->nm_register_func != nullptr) {