Merge branch '2.8' into 2.9

FasterXML · Mar 1, 2018 · 41ef2a8 · 41ef2a8
2 parents 61a6454 + 745411c
commit 41ef2a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java
@@ -967,7 +967,7 @@ private void _skipUnknownValue(int wireType) throws IOException
             _skipBytes(4);
             break;
         case WireType.FIXED_64BIT:
-            _skipBytes(64);
+            _skipBytes(8);
             break;
         case WireType.LENGTH_PREFIXED:
             int len = _decodeLength();

diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -58,7 +58,12 @@ No changes since 2.9.3
  (reported by coder-hub@github)
 - (avro): Upgrade `avro-core` dep from 1.7.7 to 1.8.1
 
-2.8.11 (not yet released)
+2.8.11.1 (not yet released)
+
+#128 (protobuf) Fix skip unknown WireType.FIXED_64BIT value bug
+ (reported, contributed fix for by marsqing@github@github)
+
+2.8.11 (24-Dec-2017)
 
 #106: (protobuf) fix calling _skipUnknownValue() twice
  (reported, contributed fix for by marsqing@github@github)