Fixed: Generate null/undefined assertion in fromObject if actually NO…

…T an enum, see #620
protobufjs · Jan 12, 2017 · 5bca18f · 5bca18f
1 parent 079388c
commit 5bca18f
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 19 deletions.
diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.js.map b/dist/noparse/protobuf.js.map
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/noparse/protobuf.min.js.map b/dist/noparse/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/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/src/converter.js b/src/converter.js
@@ -116,10 +116,10 @@ converter.fromObject = function fromObject(mtype) {
 
         // Non-repeated fields
         } else {
-            if (field.resolvedType instanceof Enum) gen // no need to test for null/undefined if an enum (uses switch)
+            if (!(field.resolvedType instanceof Enum)) gen // no need to test for null/undefined if an enum (uses switch)
     ("if(d%s!==undefined&&d%s!==null){", prop, prop);
         genConvertValue_fromObject(gen, field, i, prop);
-            if (field.resolvedType instanceof Enum) gen
+            if (!(field.resolvedType instanceof Enum)) gen
     ("}");
         }
     }