Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleanup vm module memory leakage

There are some paths here that led to dangling contexts. By being
smarter with handle management we can get rid of all the cleanup code
and fix those issues.
  • Loading branch information...
commit 70635753a3ff982ddb8686ecbb6b73b4780f8721 1 parent f405daa
@laverdet laverdet authored isaacs committed
Showing with 10 additions and 20 deletions.
  1. +10 −20 src/node_script.cc
View
30 src/node_script.cc
@@ -348,12 +348,18 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) {
display_error = true;
}
- Persistent<Context> context;
+ Handle<Context> context = Context::GetCurrent();
Local<Array> keys;
if (context_flag == newContext) {
// Create the new context
- context = Context::New();
+ // Context::New returns a Persistent<Context>, but we only need it for this
+ // function. Here we grab a temporary handle to the new context, assign it
+ // to a local handle, and then dispose the persistent handle. This ensures
+ // that when this function exits the context will be disposed.
+ Persistent<Context> tmp = Context::New();
+ context = Local<Context>::New(tmp);
+ tmp.Dispose();
} else if (context_flag == userContext) {
// Use the passed in context
@@ -361,11 +367,10 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) {
context = nContext->GetV8Context();
}
+ Context::Scope context_scope(context);
+
// New and user context share code. DRY it up.
if (context_flag == userContext || context_flag == newContext) {
- // Enter the context
- context->Enter();
-
// Copy everything from the passed in sandbox (either the persistent
// context for runInContext(), or the sandbox arg to runInNewContext()).
CloneObject(args.This(), sandbox, context->Global()->GetPrototype());
@@ -407,11 +412,6 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) {
if (output_flag == returnResult) {
result = script->Run();
if (result.IsEmpty()) {
- if (context_flag == newContext) {
- context->DetachGlobal();
- context->Exit();
- context.Dispose();
- }
return try_catch.ReThrow();
}
} else {
@@ -429,16 +429,6 @@ Handle<Value> WrappedScript::EvalMachine(const Arguments& args) {
CloneObject(args.This(), context->Global()->GetPrototype(), sandbox);
}
- if (context_flag == newContext) {
- // Clean up, clean up, everybody everywhere!
- context->DetachGlobal();
- context->Exit();
- context.Dispose();
- } else if (context_flag == userContext) {
- // Exit the passed in context.
- context->Exit();
- }
-
return result == args.This() ? result : scope.Close(result);
}
Please sign in to comment.
Something went wrong with that request. Please try again.