Verify empty base64 encoded strings for bytes fields, see #535

protobufjs · Dec 10, 2016 · 67449db · 67449db
1 parent a0398f5
commit 67449db
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
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/src/codegen/verify.js b/src/codegen/verify.js
@@ -58,7 +58,7 @@ function verifyValue(field, value) {
                 return invalid(field, "string");
             break;
         case "bytes":
-            if (!(value && typeof value.length === 'number'))
+            if (!(value && typeof value.length === 'number' || util.isString(value)))
                 return invalid(field, "buffer");
             break;
         default:
@@ -187,7 +187,7 @@ function genVerifyValue(gen, field, fieldIndex, ref) {
                 ("return%j", invalid(field, "string"));
             break;
         case "bytes": gen
-            ("if(!(%s&&typeof %s.length==='number'))", ref, ref)
+            ("if(!(%s&&typeof %s.length==='number'||util.isString(%s))", ref, ref, ref)
                 ("return%j", invalid(field, "buffer"));
             break;
         default: