Make sure callback classes are not assignable, copyable or movable.

nodejs · Aug 10, 2015 · 81f9b1d · 81f9b1d
1 parent 98d38c1
commit 81f9b1d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/nan_callbacks_12_inl.h b/nan_callbacks_12_inl.h
@@ -124,6 +124,9 @@ class FunctionCallbackInfo {
   static const int kCalleeIndex = 5;
   static const int kContextSaveIndex = 6;
   static const int kArgsLength = 7;
+
+ private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(FunctionCallbackInfo)
 };
 
 template<typename T>
@@ -154,6 +157,9 @@ class PropertyCallbackInfo {
   static const int kDataIndex = 4;
   static const int kThisIndex = 5;
   static const int kArgsLength = 6;
+
+ private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(PropertyCallbackInfo)
 };
 
 namespace imp {

diff --git a/nan_callbacks_pre_12_inl.h b/nan_callbacks_pre_12_inl.h
@@ -141,6 +141,9 @@ class FunctionCallbackInfo {
   static const int kCalleeIndex = 5;
   static const int kContextSaveIndex = 6;
   static const int kArgsLength = 7;
+
+ private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(FunctionCallbackInfo)
 };
 
 template<typename T>
@@ -168,6 +171,9 @@ class PropertyCallbackInfoBase {
   static const int kDataIndex = 4;
   static const int kThisIndex = 5;
   static const int kArgsLength = 6;
+
+ private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(PropertyCallbackInfoBase)
 };
 
 template<typename T>

diff --git a/nan_object_wrap.h b/nan_object_wrap.h
@@ -113,6 +113,7 @@ class ObjectWrap {
   int refs_;  // ro
 
  private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(ObjectWrap)
 #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 4 ||                      \
   (V8_MAJOR_VERSION == 4 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 3))
 

diff --git a/nan_weak.h b/nan_weak.h
@@ -71,6 +71,7 @@ class WeakCallbackInfo {
   }
 
  private:
+  NAN_DISALLOW_ASSIGN_COPY_MOVE(WeakCallbackInfo)
   Callback callback_;
   v8::Isolate *isolate_;
   void *parameter_;

diff --git a/test/cpp/returnvalue.cpp b/test/cpp/returnvalue.cpp
@@ -10,10 +10,10 @@
 
 using namespace Nan;  // NOLINT(build/namespaces)
 
-Global<v8::Boolean> global;
+static Global<v8::Boolean> global;
 
 NAN_METHOD(ReturnAValue) {
-  const FunctionCallbackInfo<v8::Value> cbinfo = info;
+  const FunctionCallbackInfo<v8::Value> &cbinfo = info;
   ReturnValue<v8::Value> ret = cbinfo.GetReturnValue();
   if (cbinfo.Length() == 1) {
     ret.Set(info[0].As<v8::String>());