Other: Ensured that pbjs' beautify does not break regular expressions…

… in generated verify functions
protobufjs · Jan 12, 2017 · 44167db · 44167db
1 parent 3946e0f
commit 44167db
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 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/verifier.js b/src/verifier.js
@@ -73,15 +73,15 @@ function genVerifyKey(gen, field, ref) {
         case "sint32":
         case "fixed32":
         case "sfixed32": gen
-            ("if(!/^-?(?:0|[1-9]\\d*)$/.test(%s))", ref)
+            ("if(!/^-?(?:0|[1-9][0-9]*)$/.test(%s))", ref) // it's important not to use any literals here that might be confused with short variable names by pbjs' beautify
                 ("return%j", invalid(field, "integer key"));
             break;
         case "int64":
         case "uint64":
         case "sint64":
         case "fixed64":
         case "sfixed64": gen
-            ("if(!/^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9]\\d*))$/.test(%s))", ref)
+            ("if(!/^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9][0-9]*))$/.test(%s))", ref) // see comment above: x is ok, d is not
                 ("return%j", invalid(field, "integer|Long key"));
             break;
         case "bool": gen