unwrapBufferToPointer supports noe::Buffer object

jiahansu · Sep 11, 2015 · be63274 · be63274
1 parent 65d1430
commit be63274
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bridjs",
-    "version": "0.3.4-1",
+    "version": "0.3.4-2",
     "description": "V8 bindings for dyncall, and BridJ-like API for nodejs.",
     "keywords": [
         "dyncall",

diff --git a/src/dyncall_v8_utils.cc b/src/dyncall_v8_utils.cc
@@ -239,9 +239,17 @@ Local<Value> bridjs::Utils::wrapPointerToBuffer(Isolate* isolate, const void* pt
 
 void* bridjs::Utils::unwrapBufferToPointer(v8::Local<v8::Value> value){
 	void* ptr;
-        v8::Local<v8::ArrayBuffer> ab = value.As<v8::ArrayBuffer>();
+        void* bufferPtr;
+
+        if(node::Buffer::HasInstance(value)){
+            bufferPtr = node::Buffer::Data(value);
+        }else{
+            v8::Local<v8::ArrayBuffer> ab = value.As<v8::ArrayBuffer>();
+
+            bufferPtr = ab->GetContents().Data();
+        }
 
-	std::memcpy(&ptr, ab->GetContents().Data(), sizeof(void*));
+	std::memcpy(&ptr, bufferPtr, sizeof(void*));
 
 	return ptr;
 }