Update the buffer-reusing constructor to return a MaybeLocal

nodejs · Jul 4, 2015 · 3621ab6 · 3621ab6
1 parent 7747fd0
commit 3621ab6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/nan.h b/nan.h
@@ -717,7 +717,7 @@ class TryCatch {
 #endif
   }
 
-  NAN_INLINE v8::Local<v8::Object> NewBuffer(
+  NAN_INLINE MaybeLocal<v8::Object> NewBuffer(
       char* data
     , uint32_t size
   ) {
@@ -727,7 +727,8 @@ class TryCatch {
 #if NODE_MODULE_VERSION > IOJS_2_0_MODULE_VERSION
     return node::Buffer::New(v8::Isolate::GetCurrent(), data, size);
 #else
-    return node::Buffer::Use(v8::Isolate::GetCurrent(), data, size);
+    return MaybeLocal<v8::Object>(
+        node::Buffer::Use(v8::Isolate::GetCurrent(), data, size));
 #endif
   }
 
@@ -1074,16 +1075,16 @@ class Utf8String {
     delete[] data;
   }
 
-  NAN_INLINE v8::Local<v8::Object> NewBuffer(
+  NAN_INLINE MaybeLocal<v8::Object> NewBuffer(
       char* data
     , uint32_t size
   ) {
     EscapableHandleScope scope;
     // arbitrary buffer lengths requires
     // NODE_MODULE_VERSION >= IOJS_3_0_MODULE_VERSION
     assert(size <= imp::kMaxLength && "too large buffer");
-    return scope.Escape(New(
-        node::Buffer::New(data, size, FreeData, NULL)->handle_));
+    return MaybeLocal<v8::Object>(scope.Escape(New(
+        node::Buffer::New(data, size, FreeData, NULL)->handle_)));
   }
 
   NAN_INLINE bool HasInstance(

diff --git a/test/cpp/buffer.cpp b/test/cpp/buffer.cpp
@@ -41,7 +41,8 @@ NAN_METHOD(New3) {
   for (unsigned char i = 0; i < DATA_SIZE; i++) {
     dynamic_data[i] = 'a' + i;
   }
-  info.GetReturnValue().Set(NewBuffer(dynamic_data, DATA_SIZE));
+  info.GetReturnValue().Set(
+      NewBuffer(dynamic_data, DATA_SIZE).ToLocalChecked());
 }
 
 NAN_METHOD(Copy) {