From 82a4e4e3d3abf9c40bdbc54135d75d27eb5ef5a0 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Tue, 31 Jul 2018 11:35:48 -0700
Subject: Fix js reader.js's skipGroup

---
 js/binary/reader.js      | 12 +++++-------
 js/binary/reader_test.js |  2 ++
 js/package.json          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/binary/reader.js b/js/binary/reader.js
index 2dc3eb70..5e48f19b 100644
--- a/js/binary/reader.js
+++ b/js/binary/reader.js
@@ -389,7 +389,7 @@ jspb.BinaryReader.prototype.skipFixed64Field = function() {
  */
 jspb.BinaryReader.prototype.skipGroup = function() {
   // Keep a stack of start-group tags that must be matched by end-group tags.
-  var nestedGroups = [this.nextField_];
+  var previousField = this.nextField_;
   do {
     if (!this.nextField()) {
       goog.asserts.fail('Unmatched start-group tag: stream EOF');
@@ -397,19 +397,17 @@ jspb.BinaryReader.prototype.skipGroup = function() {
       return;
     }
     if (this.nextWireType_ ==
-        jspb.BinaryConstants.WireType.START_GROUP) {
-      // Nested group start.
-      nestedGroups.push(this.nextField_);
-    } else if (this.nextWireType_ ==
                jspb.BinaryConstants.WireType.END_GROUP) {
       // Group end: check that it matches top-of-stack.
-      if (this.nextField_ != nestedGroups.pop()) {
+      if (this.nextField_ != previousField) {
         goog.asserts.fail('Unmatched end-group tag');
         this.error_ = true;
         return;
       }
+      return;
     }
-  } while (nestedGroups.length > 0);
+    this.skipField();
+  } while (true);
 };
 
 
diff --git a/js/binary/reader_test.js b/js/binary/reader_test.js
index 95711385..7fdf81b9 100644
--- a/js/binary/reader_test.js
+++ b/js/binary/reader_test.js
@@ -680,8 +680,10 @@ describe('binaryReaderTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */({});
     writer.writeGroup(5, dummyMessage, function() {
       writer.writeInt64(42, 42);
+      writer.writeString(43, 'The quick brown fox jumps over the lazy dog');
       writer.writeGroup(6, dummyMessage, function() {
         writer.writeInt64(84, 42);
+        writer.writeString(85, 'The quick brown fox jumps over the lazy dog');
       });
     });
 
diff --git a/js/package.json b/js/package.json
index 325f2dcc..d2afcb3c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -22,5 +22,5 @@
     "url": "https://github.com/google/protobuf/tree/master/js"
   },
   "author": "Google Protocol Buffers Team",
-  "license" : "BSD-3-Clause"
+  "license": "BSD-3-Clause"
 }
-- 
cgit v1.2.3