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

src: fix MakeCallback() handle leak

Browse Source 
Create a new HandleScope before looking up the object context with
v8::Object::CreationContext(), else we leak the Local<Context> into
the current HandleScope.

That's relatively harmless unless the HandleScope is long-lived and
MakeCallback() is called a lot.  In a scenario like that, we may end
up leaking a lot of memory.

What is unfortunate about this change is that we're trying hard to
eradicate the node_isolate global.  Longer term, we will probably have
to change the MakeCallback() prototype to one that requires an explicit
v8::Isolate* argument.
This commit is contained in:
Ben Noordhuis 2013-11-16 20:05:42 +01:00 committed by Timothy J Fontaine
parent 1f2f3fa83a
commit 4dc6f4adf4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/node.cc
View File

@ -1150,10 +1150,10 @@ Handle<Value> MakeCallback(Handle<Object> recv,
const char* method,
int argc,
Handle<Value> argv[]) {
HandleScope handle_scope(node_isolate); // FIXME(bnoordhuis) Isolate-ify.
Local<Context> context = recv->CreationContext();
Environment* env = Environment::GetCurrent(context);
Context::Scope context_scope(context);
HandleScope handle_scope(env->isolate());
return handle_scope.Close(MakeCallback(env, recv, method, argc, argv));
}
@ -1162,10 +1162,10 @@ Handle<Value> MakeCallback(Handle<Object> recv,
Handle<String> symbol,
int argc,
Handle<Value> argv[]) {
HandleScope handle_scope(node_isolate); // FIXME(bnoordhuis) Isolate-ify.
Local<Context> context = recv->CreationContext();
Environment* env = Environment::GetCurrent(context);
Context::Scope context_scope(context);
HandleScope handle_scope(env->isolate());
return handle_scope.Close(MakeCallback(env, recv, symbol, argc, argv));
}
@ -1174,10 +1174,10 @@ Handle<Value> MakeCallback(Handle<Object> recv,
Handle<Function> callback,
int argc,
Handle<Value> argv[]) {
HandleScope handle_scope(node_isolate); // FIXME(bnoordhuis) Isolate-ify.
Local<Context> context = recv->CreationContext();
Environment* env = Environment::GetCurrent(context);
Context::Scope context_scope(context);
HandleScope handle_scope(env->isolate());
return handle_scope.Close(
MakeCallback(env, recv.As<Value>(), callback, argc, argv));
}