From 8caa4840ed357e1cadde6f686ea4840e88c9d954 Mon Sep 17 00:00:00 2001 From: marsqing Date: Wed, 6 Dec 2017 01:28:07 +0800 Subject: [PATCH] always call checkEnd() when skip unknown field --- .../jackson/dataformat/protobuf/ProtobufParser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index f49eb73f3..ae5d9f361 100644 --- a/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java +++ b/protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java @@ -911,10 +911,10 @@ private JsonToken _skipUnknownField(int tag, int wireType) throws IOException } while (true) { _skipUnknownValue(wireType); + if (_checkEnd()) { + return (_currToken = JsonToken.END_OBJECT); + } if (_state == STATE_NESTED_KEY) { - if (_checkEnd()) { - return (_currToken = JsonToken.END_OBJECT); - } if (_inputPtr >= _inputEnd) { loadMoreGuaranteed(); }