New: Verify accepts non-null objects only, see #685

protobufjs · Feb 23, 2017 · 7f3f460 · 7f3f460
1 parent 2ddb76b
commit 7f3f460
Show file tree

Hide file tree

Showing 16 changed files with 73 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.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/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/index.d.ts b/index.d.ts
@@ -959,6 +959,12 @@ export abstract class ReflectionObject {
      */
     comment: string;
 
+    /**
+     * Defining file name.
+     * @type {?string}
+     */
+    filename: string;
+
     /**
      * Reference to the root namespace.
      * @name ReflectionObject#root

diff --git a/src/type.js b/src/type.js
@@ -270,7 +270,8 @@ Type.prototype.add = function add(object) {
         // The root object takes care of adding distinct sister-fields to the respective extended
         // type instead.
 
-        if (this.fieldsById[object.id])
+        // avoids calling the getter if not absolutely necessary because it's called quite frequently
+        if (this._fieldsById ? this._fieldsById[object.id] : this.fieldsById[object.id])
             throw Error("duplicate id " + object.id + " in " + this);
 
         if (object.parent)

diff --git a/src/verifier.js b/src/verifier.js
@@ -118,11 +118,11 @@ function genVerifyKey(gen, field, ref) {
 function verifier(mtype) {
     /* eslint-disable no-unexpected-multiline */
 
-    if (/* initializes */ !mtype.fieldsArray.length)
-        return util.codegen()("return null");
-    var gen = util.codegen("m");
+    var gen = util.codegen("m")
+    ("if(typeof m!==\"object\"||m===null)")
+        ("return%j", "object expected");
 
-    for (var i = 0; i < mtype._fieldsArray.length; ++i) {
+    for (var i = 0; i < /* initializes */ mtype.fieldsArray.length; ++i) {
         var field = mtype._fieldsArray[i].resolve(),
             ref   = "m" + util.safeProp(field.name);