vm: assign Environment to created context

ContextifyContext::CreateV8Context is now create context
with Environment pointer

Signed-off-by: Fedor Indutny <fedor@indutny.com>

3 files changed, 10 insertions, 1 deletions

diff --git a/src/env-inl.h b/src/env-inl.h
index 9a6199da2f..890ddd2305 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -190,10 +190,14 @@ inline void Environment::TickInfo::set_last_threw(bool value) {
 
 inline Environment* Environment::New(v8::Local<v8::Context> context) {
   Environment* env = new Environment(context);
-  context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, env);
+  env->AssignToContext(context);
   return env;
 }
 
+inline void Environment::AssignToContext(v8::Local<v8::Context> context) {
+  context->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex, this);
+}
+
 inline Environment* Environment::GetCurrent(v8::Isolate* isolate) {
   return GetCurrent(isolate->GetCurrentContext());
 }
diff --git a/src/env.h b/src/env.h
index d355b4899b..224d1d8a0b 100644
--- a/src/env.h
+++ b/src/env.h
@@ -362,6 +362,8 @@ class Environment {
   void StartGarbageCollectionTracking(v8::Local<v8::Function> callback);
   void StopGarbageCollectionTracking();
 
+  void AssignToContext(v8::Local<v8::Context> context);
+
   inline v8::Isolate* isolate() const;
   inline uv_loop_t* event_loop() const;
   inline bool has_async_listener() const;
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index daeb7c768a..abf17f6c8d 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -231,6 +231,9 @@ class ContextifyContext {
     Local<Context> ctx = Context::New(env->isolate(), NULL, object_template);
     if (!ctx.IsEmpty())
       ctx->SetSecurityToken(env->context()->GetSecurityToken());
+
+    env->AssignToContext(ctx);
+
     return scope.Escape(ctx);
   }