Skip to content

Commit 67449db

Browse files
committed
Verify empty base64 encoded strings for bytes fields, see #535
1 parent a0398f5 commit 67449db

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

dist/protobuf.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js.gz

1 Byte
Binary file not shown.

dist/protobuf.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codegen/verify.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function verifyValue(field, value) {
5858
return invalid(field, "string");
5959
break;
6060
case "bytes":
61-
if (!(value && typeof value.length === 'number'))
61+
if (!(value && typeof value.length === 'number' || util.isString(value)))
6262
return invalid(field, "buffer");
6363
break;
6464
default:
@@ -187,7 +187,7 @@ function genVerifyValue(gen, field, fieldIndex, ref) {
187187
("return%j", invalid(field, "string"));
188188
break;
189189
case "bytes": gen
190-
("if(!(%s&&typeof %s.length==='number'))", ref, ref)
190+
("if(!(%s&&typeof %s.length==='number'||util.isString(%s))", ref, ref, ref)
191191
("return%j", invalid(field, "buffer"));
192192
break;
193193
default:

0 commit comments

Comments
 (0)