Merge branch '2.8' into 2.9

Author: cowtowncoder

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java

@@ -924,10 +924,12 @@ private JsonToken _skipUnknownField(int tag, int wireType) throws IOException
         }
         while (true) {
             _skipUnknownValue(wireType);
+            // 05-Dec-2017, tatu: as per [#126] seems like we need to check this not just for
+            //    STATE_NESTED_KEY but for arrays too at least?
+            if (_checkEnd()) {
+                return (_currToken = JsonToken.END_OBJECT);
+            }
             if (_state == STATE_NESTED_KEY) {
-                if (_checkEnd()) {
-                    return (_currToken = JsonToken.END_OBJECT);
-                }
                 if (_inputPtr >= _inputEnd) {
                     loadMoreGuaranteed();
                 }

release-notes/CREDITS

@@ -31,6 +31,8 @@ marsqing@github
 * Reported #116 (protobuf), contributed fix for: Should skip the positive byte
   which is the last byte of an varint
  (2.9.3)
+* Reported #126, contributed fix for: always call checkEnd() when skip unknown field
+ (2.8.11 / 2.9.3)
 
 baharclerode@github:
 

release-notes/VERSION

@@ -59,6 +59,7 @@ Modules:
 #106: (protobuf) fix calling _skipUnknownValue() twice
  (reported, contributed fix for by marsqing@github@github)
 #108: (protobuf) fix NPE in skip unknown nested key
+#126: (protobuf) always call checkEnd() when skip unknown field
 
 2.8.10 (24-Aug-2017)