fix: possible infinite loop when parsing option

bench/prof.js

@@ -86,14 +86,14 @@ function setupBrowser() {
 switch (process.argv[2]) {
  case "encode-browser":
  setupBrowser();
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  case "encode":
  for (var i = 0; i < count; ++i)
  Test.encode(data).finish();
  break;
  case "decode-browser":
  setupBrowser();
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  case "decode":
  var buf = Test.encode(data).finish();
  for (var j = 0; j < count; ++j)

cli/lib/tsd-jsdoc/publish.js

@@ -438,7 +438,7 @@ function handleElement(element, parent) {
  handleEnum(element, parent);
  break;
  }
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  case "namespace":
  handleNamespace(element, parent);
  break;

src/converter.js

@@ -62,7 +62,7 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
  break;
  case "uint64":
  isUnsigned = true;
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  case "int64":
  case "sint64":
  case "fixed64":
@@ -176,7 +176,7 @@ function genValuePartial_toObject(gen, field, fieldIndex, prop) {
  break;
  case "uint64":
  isUnsigned = true;
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  case "int64":
  case "sint64":
  case "fixed64":

src/parse.js

@@ -227,7 +227,7 @@ function parse(source, root, options) {
  break;
  case "public":
  next();
- // eslint-disable-line no-fallthrough
+ // eslint-disable-next-line no-fallthrough
  default:
  whichImports = imports || (imports = []);
  break;
@@ -621,6 +621,9 @@ function parse(source, root, options) {
  if (!nameRe.test(token = next())) {
  throw illegal(token, "name");
  }
+ if (token === null) {
+ throw illegal(token, "end of input");
+ }
 
  var value;
  var propName = token;

tests/cli.js

@@ -192,16 +192,14 @@ tape.test("pbjs generates static code with message filter", function (test) {
  var $protobuf = protobuf;
  eval(jsCode);
 
- console.log(protobuf.roots);
-
  var NeedMessage1 = protobuf.roots.default.filtertest.NeedMessage1;
  var NeedMessage2 = protobuf.roots.default.filtertest.NeedMessage2;
  var DependentMessage1 = protobuf.roots.default.filtertest.DependentMessage1;
  var DependentMessageFromImport = protobuf.roots.default.DependentMessageFromImport;
 
  var NotNeedMessageInRootFile = protobuf.roots.default.filtertest.NotNeedMessageInRootFile;
  var NotNeedMessageInImportFile = protobuf.roots.default.NotNeedMessageInImportFile;
- 
+
  test.ok(NeedMessage1, "NeedMessage1 is loaded");
  test.ok(NeedMessage2, "NeedMessage2 is loaded");
  test.ok(DependentMessage1, "DependentMessage1 is loaded");

tests/comp_options-parse.js

@@ -157,5 +157,10 @@ tape.test("Options", function (test) {
  test.end();
  });
 
+ test.test(test.name + " - invalid option", function (test) {
+ test.throws(() => { protobuf.parse("option (foo).whatever = {")});
+ test.end();
+ });
+
  test.end();
 });