Skip to content

Commit 41ef2a8

Browse files
committed
Merge branch '2.8' into 2.9
2 parents 61a6454 + 745411c commit 41ef2a8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ private void _skipUnknownValue(int wireType) throws IOException
967967
_skipBytes(4);
968968
break;
969969
case WireType.FIXED_64BIT:
970-
_skipBytes(64);
970+
_skipBytes(8);
971971
break;
972972
case WireType.LENGTH_PREFIXED:
973973
int len = _decodeLength();

release-notes/VERSION

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ No changes since 2.9.3
5858
(reported by coder-hub@github)
5959
- (avro): Upgrade `avro-core` dep from 1.7.7 to 1.8.1
6060

61-
2.8.11 (not yet released)
61+
2.8.11.1 (not yet released)
62+
63+
#128 (protobuf) Fix skip unknown WireType.FIXED_64BIT value bug
64+
(reported, contributed fix for by marsqing@github@github)
65+
66+
2.8.11 (24-Dec-2017)
6267

6368
#106: (protobuf) fix calling _skipUnknownValue() twice
6469
(reported, contributed fix for by marsqing@github@github)

0 commit comments

Comments
 (0)