Make sure to fully read any varint, fixes #3

Author: Daniel Wirtz

ByteBuffer.js

@@ -1042,14 +1042,11 @@
                 b;
             var value = 0 >>> 0;
             do {
-                if (count == ByteBuffer.MAX_VARINT32_BYTES) {
-                    throw(new Error("Cannot read Varint32 from "+this+"@"+offset+": Number of bytes is larger than "+ByteBuffer.MAX_VARINT32_BYTES));
-                }
                 b = src[offset+count];
                 value |= ((b&0x7F)<<(7*count)) >>> 0;
                 ++count;
             } while (b & 0x80);
-            value = value | 0;
+            value = value | 0; // Make sure to discard the higher order bits
             if (advance) {
                 this.offset += count;
                 return value;

ByteBuffer.min.js

@@ -976,14 +976,11 @@
                 b;
             var value = 0 >>> 0;
             do {
-                if (count == ByteBuffer.MAX_VARINT32_BYTES) {
-                    throw(new Error("Cannot read Varint32 from "+this+"@"+offset+": Number of bytes is larger than "+ByteBuffer.MAX_VARINT32_BYTES));
-                }
                 b = src[offset+count];
                 value |= ((b&0x7F)<<(7*count)) >>> 0;
                 ++count;
             } while (b & 0x80);
-            value = value | 0;
+            value = value | 0; // Make sure to discard the higher order bits
             if (advance) {
                 this.offset += count;
                 return value;

ByteBuffer.min.map

@@ -1,6 +1,6 @@
 {
     "name": "bytebuffer",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "author": "Daniel Wirtz <[email protected]>",
     "description": "ByteBuffer.js: A Java-like, Netty-inspired ByteBuffer implementation using typed arrays.",
     "main": "ByteBuffer.js",

ByteBuffer.noexpose.js

@@ -1042,14 +1042,11 @@
                 b;
             var value = 0 >>> 0;
             do {
-                if (count == ByteBuffer.MAX_VARINT32_BYTES) {
-                    throw(new Error("Cannot read Varint32 from "+this+"@"+offset+": Number of bytes is larger than "+ByteBuffer.MAX_VARINT32_BYTES));
-                }
                 b = src[offset+count];
                 value |= ((b&0x7F)<<(7*count)) >>> 0;
                 ++count;
             } while (b & 0x80);
-            value = value | 0;
+            value = value | 0; // Make sure to discard the higher order bits
             if (advance) {
                 this.offset += count;
                 return value;

package.json

@@ -31,6 +31,12 @@ var FILE = "ByteBuffer.min.js";
  */
 var ByteBuffer = require(__dirname+"/../"+FILE);
 
+/**
+ * Long.
+ * @type {Long}
+ */
+var Long = ByteBuffer.Long;
+
 /**
  * Constructs a new Sandbox for module loaders and shim testing.
  * @param {Object.<string,*>} properties Additional properties to set
@@ -434,6 +440,15 @@ var suite = {
         test.done();
     },
 
+    "writeVarint64/readVarint32": function(test) {
+        var bb = new ByteBuffer();
+        bb.writeVarint64(Long.fromNumber(-1));
+        bb.flip();
+        var n = bb.readVarint32();
+        test.equal(n, -1);
+        test.done();
+    },
+    
     "LE/BE": function(test) {
         var bb = new ByteBuffer(8).LE().writeInt(1).BE().writeInt(2).flip();
         test.equal(bb.toHex(), "<01 00 00 00 00 00 00 02>");