Add handle scopes

Author: kkoopa

nan.h

@@ -805,24 +805,25 @@ class TryCatch {
     , v8::Local<v8::Function> func
     , int argc
     , v8::Local<v8::Value>* argv) {
-#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
+    v8::Isolate *isolate = v8::Isolate::GetCurrent();
+    v8::EscapableHandleScope scope(isolate);
     v8::Local<v8::Object> target_obj;
+#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, func, argc, argv));
+    return scope.Escape(
+        New(node::MakeCallback(isolate, target_obj, func, argc, argv)));
 #else
-    v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = Nan::To<v8::Object>(target).ToLocalChecked();
     }
-    return node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, func, argc, argv);
+    return scope.Escape(
+        node::MakeCallback(isolate, target_obj, func, argc, argv));
 #endif
   }
 
@@ -831,24 +832,25 @@ class TryCatch {
     , v8::Local<v8::String> symbol
     , int argc
     , v8::Local<v8::Value>* argv) {
-#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
+    v8::Isolate *isolate = v8::Isolate::GetCurrent();
+    v8::EscapableHandleScope scope(isolate);
     v8::Local<v8::Object> target_obj;
+#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, symbol, argc, argv));
+    return scope.Escape(
+        New(node::MakeCallback(isolate, target_obj, symbol, argc, argv)));
 #else
-    v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = Nan::To<v8::Object>(target).ToLocalChecked();
     }
-    return node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, symbol, argc, argv);
+    return scope.Escape(
+        node::MakeCallback(isolate, target_obj, symbol, argc, argv));
 #endif
   }
 
@@ -857,24 +859,25 @@ class TryCatch {
     , const char* method
     , int argc
     , v8::Local<v8::Value>* argv) {
-#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
+    v8::Isolate *isolate = v8::Isolate::GetCurrent();
+    v8::EscapableHandleScope scope(isolate);
     v8::Local<v8::Object> target_obj;
+#if NODE_MODULE_VERSION < IOJS_3_0_MODULE_VERSION
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, method, argc, argv));
+    return scope.Escape(
+        New(node::MakeCallback(isolate, target_obj, method, argc, argv)));
 #else
-    v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
-      target_obj = v8::Isolate::GetCurrent()->GetCurrentContext()->Global();
+      target_obj = isolate->GetCurrentContext()->Global();
     } else {
       target_obj = Nan::To<v8::Object>(target).ToLocalChecked();
     }
-    return node::MakeCallback(
-        v8::Isolate::GetCurrent(), target_obj, method, argc, argv);
+    return scope.Escape(
+        node::MakeCallback(isolate, target_obj, method, argc, argv));
 #endif
   }
 
@@ -1178,41 +1181,44 @@ widenString(std::vector<uint16_t> *ws, const uint8_t *s, int l) {
     , v8::Local<v8::Function> func
     , int argc
     , v8::Local<v8::Value>* argv) {
+    v8::HandleScope scope;
     v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
       target_obj = v8::Context::GetCurrent()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(target_obj, func, argc, argv));
+    return scope.Close(New(node::MakeCallback(target_obj, func, argc, argv)));
   }
 
   NAN_INLINE v8::Local<v8::Value> MakeCallback(
       v8::Local<v8::Value> target
     , v8::Local<v8::String> symbol
     , int argc
     , v8::Local<v8::Value>* argv) {
+    v8::HandleScope scope;
     v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
       target_obj = v8::Context::GetCurrent()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(target_obj, symbol, argc, argv));
+    return scope.Close(New(node::MakeCallback(target_obj, symbol, argc, argv)));
   }
 
   NAN_INLINE v8::Local<v8::Value> MakeCallback(
       v8::Local<v8::Value> target
     , const char* method
     , int argc
     , v8::Local<v8::Value>* argv) {
+    v8::HandleScope scope;
     v8::Local<v8::Object> target_obj;
     if (target->IsUndefined() || target->IsNull()) {
       target_obj = v8::Context::GetCurrent()->Global();
     } else {
       target_obj = target->ToObject();
     }
-    return New(node::MakeCallback(target_obj, method, argc, argv));
+    return scope.Close(New(node::MakeCallback(target_obj, method, argc, argv)));
   }
 
   NAN_INLINE void FatalException(const TryCatch& try_catch) {

nan_maybe_pre_43_inl.h

@@ -262,13 +262,15 @@ NAN_INLINE MaybeLocal<v8::Value> CallAsFunction(
 #if NODE_MODULE_VERSION > NODE_0_10_MODULE_VERSION
   return MaybeLocal<v8::Value>(obj->CallAsFunction(recv, argc, argv));
 #else
+  v8::HandleScope scope;
   v8::Local<v8::Object> recv_obj;
   if (recv->IsUndefined() || recv->IsNull()) {
     recv_obj = v8::Context::GetCurrent()->Global();
   } else {
     recv_obj = recv->ToObject();
   }
-  return MaybeLocal<v8::Value>(obj->CallAsFunction(recv_obj, argc, argv));
+  return MaybeLocal<v8::Value>(
+      scope.Close(obj->CallAsFunction(recv_obj, argc, argv)));
 #endif
 }