New: Reader.create asserts that buffer is a valid buffer, see #695

protobufjs · Mar 4, 2017 · 0d81a9c · 0d81a9c
1 parent 4b21e00
commit 0d81a9c
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 41 deletions.
diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.js.map b/dist/light/protobuf.js.map
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/light/protobuf.min.js.gz b/dist/light/protobuf.min.js.gz
diff --git a/dist/light/protobuf.min.js.map b/dist/light/protobuf.min.js.map
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
diff --git a/dist/minimal/protobuf.js.map b/dist/minimal/protobuf.js.map
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/minimal/protobuf.min.js.gz b/dist/minimal/protobuf.min.js.gz
diff --git a/dist/minimal/protobuf.min.js.map b/dist/minimal/protobuf.min.js.map
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "6.6.5",
+  "version": "6.7.0",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <[email protected]>",
@@ -87,7 +87,7 @@
     "tape": "^4.6.3",
     "tmp": "0.0.31",
     "typescript": "^2.2.1",
-    "uglify-js": "^2.7.5",
+    "uglify-js": "^2.8.4",
     "vinyl-buffer": "^1.0.0",
     "vinyl-fs": "^2.4.4",
     "vinyl-source-stream": "^1.1.0"

diff --git a/src/reader.js b/src/reader.js
@@ -40,6 +40,12 @@ function Reader(buffer) {
     this.len = buffer.length;
 }
 
+function create_array(buffer) {
+    if (buffer instanceof Uint8Array || buffer instanceof Array)
+        return new Reader(buffer);
+    throw Error("illegal buffer");
+}
+
 /**
  * Creates a new reader using the specified buffer.
  * @function
@@ -51,13 +57,12 @@ Reader.create = util.Buffer
         return (Reader.create = function create_buffer(buffer) {
             return util.Buffer.isBuffer(buffer)
                 ? new BufferReader(buffer)
-                : new Reader(buffer);
+                /* istanbul ignore next */
+                : create_array(buffer);
         })(buffer);
     }
     /* istanbul ignore next */
-    : function create_array(buffer) {
-        return new Reader(buffer);
-    };
+    : create_array;
 
 Reader.prototype._slice = util.Array.prototype.subarray || /* istanbul ignore next */ util.Array.prototype.slice;