am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"

* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c': Fix how getRepeatedFieldArrayLength works
10 years ago · 4be139dcd8
parent 33824b0f1b ec0e1c00e0
commit 4be139dcd8
1 changed files with 1 additions and 5 deletions
--- a/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java
+++ b/java/src/main/java/com/google/protobuf/nano/WireFormatNano.java
@ -113,11 +113,7 @@ public final class WireFormatNano {
    int arrayLength = 1;
    int startPos = input.getPosition();
    input.skipField(tag);
-    while (input.getBytesUntilLimit() > 0) {
+    while (input.readTag() == tag) {
      int thisTag = input.readTag();
      if (thisTag != tag) {
        break;
      }
      input.skipField(tag);
      arrayLength++;
    }