Clone on ByteBuffer#wrap(ByteBuffer)

Author: dcodeIO

ByteBuffer.js

@@ -181,7 +181,15 @@
                 b = new Uint8Array(buffer).buffer; // noop on node <= 0.8
                 buffer = (b === buffer) ? toArrayBuffer(buffer) : b;
             }
-            // Wrap anything that is or contains an ArrayBuffer
+            // Refuse to wrap anything that's null or not an object
+            if (buffer === null || typeof buffer !== 'object') {
+                throw(new Error("Cannot wrap null or non-object"));
+            }
+            // Wrap ByteBuffer by cloning (preserve offsets)
+            if (buffer instanceof ByteBuffer) {
+                return buffer.clone();
+            }
+            // Wrap any object that is or contains an ArrayBuffer
             if (!!buffer["array"]) {
                 buffer = buffer["array"];
             } else if (!!buffer["buffer"]) {
@@ -1070,7 +1078,9 @@
             var value = 0 >>> 0;
             do {
                 b = src.getUint8(offset+count);
-                value |= ((b&0x7F)<<(7*count)) >>> 0;
+                if (count < ByteBuffer.MAX_VARINT32_BYTES) {
+                    value |= ((b&0x7F)<<(7*count)) >>> 0;
+                }
                 ++count;
             } while (b & 0x80);
             value = value | 0; // Make sure to discard the higher order bits

ByteBuffer.min.js

@@ -168,7 +168,15 @@
                 b = new Uint8Array(buffer).buffer; // noop on node <= 0.8
                 buffer = (b === buffer) ? toArrayBuffer(buffer) : b;
             }
-            // Wrap anything that is or contains an ArrayBuffer
+            // Refuse to wrap anything that's null or not an object
+            if (buffer === null || typeof buffer !== 'object') {
+                throw(new Error("Cannot wrap null or non-object"));
+            }
+            // Wrap ByteBuffer by cloning (preserve offsets)
+            if (buffer instanceof ByteBuffer) {
+                return buffer.clone();
+            }
+            // Wrap any object that is or contains an ArrayBuffer
             if (!!buffer["array"]) {
                 buffer = buffer["array"];
             } else if (!!buffer["buffer"]) {
@@ -1004,7 +1012,9 @@
             var value = 0 >>> 0;
             do {
                 b = src.getUint8(offset+count);
-                value |= ((b&0x7F)<<(7*count)) >>> 0;
+                if (count < ByteBuffer.MAX_VARINT32_BYTES) {
+                    value |= ((b&0x7F)<<(7*count)) >>> 0;
+                }
                 ++count;
             } while (b & 0x80);
             value = value | 0; // Make sure to discard the higher order bits

ByteBuffer.min.map

@@ -1,6 +1,6 @@
 {
     "name": "bytebuffer",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "author": "Daniel Wirtz <dcode@dcode.io>",
     "description": "ByteBuffer.js: A Java-like, Netty-inspired ByteBuffer implementation using typed arrays.",
     "main": "ByteBuffer.js",

ByteBuffer.noexpose.js

@@ -181,7 +181,15 @@
                 b = new Uint8Array(buffer).buffer; // noop on node <= 0.8
                 buffer = (b === buffer) ? toArrayBuffer(buffer) : b;
             }
-            // Wrap anything that is or contains an ArrayBuffer
+            // Refuse to wrap anything that's null or not an object
+            if (buffer === null || typeof buffer !== 'object') {
+                throw(new Error("Cannot wrap null or non-object"));
+            }
+            // Wrap ByteBuffer by cloning (preserve offsets)
+            if (buffer instanceof ByteBuffer) {
+                return buffer.clone();
+            }
+            // Wrap any object that is or contains an ArrayBuffer
             if (!!buffer["array"]) {
                 buffer = buffer["array"];
             } else if (!!buffer["buffer"]) {
@@ -1070,7 +1078,9 @@
             var value = 0 >>> 0;
             do {
                 b = src.getUint8(offset+count);
-                value |= ((b&0x7F)<<(7*count)) >>> 0;
+                if (count < ByteBuffer.MAX_VARINT32_BYTES) {
+                    value |= ((b&0x7F)<<(7*count)) >>> 0;
+                }
                 ++count;
             } while (b & 0x80);
             value = value | 0; // Make sure to discard the higher order bits

package.json

@@ -97,10 +97,11 @@ var suite = {
         test.done();
     },
 
-    "wrap(ByteBuffer)": function(test) {
-        var bb2 = new ByteBuffer(1);
+    "wrap(ByteBuffer)": function(test) { // clones
+        var bb2 = new ByteBuffer(4).writeInt32(0x12345678).flip();
+        bb2.offset = 1;
         var bb = ByteBuffer.wrap(bb2);
-        test.strictEqual(bb.array, bb2.array);
+        test.strictEqual(bb2.toHex(), bb.toHex());
         test.done();
     },