Fix #85 for 2.7(.10) as well

FasterXML · May 3, 2017 · 1f160ff · 1f160ff
1 parent 3fe6796
commit 1f160ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -4,6 +4,10 @@ Project: jackson-dataformat-protobuf
 === Releases ===
 ------------------------------------------------------------------------
 
+2.7.10 (not yet released)
+
+dataformats-binary#85: _decode32Bits() bug in ProtobufParser
+
 2.7.9 (04-Feb-2017)
 2.7.8 (26-Sep-2016)
 2.7.7 (27-Aug-2016)

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java b/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java
@@ -2258,8 +2258,8 @@ protected final int _decode32Bits() throws IOException {
             return _slow32();
         }
         final byte[] b = _inputBuffer;
-        int v = (b[ptr] & 0xFF) + ((b[ptr+1]) << 8)
-                + ((b[ptr+2] & 0xFF) << 16) + (b[ptr+3] << 24);
+        int v = (b[ptr] & 0xFF) + ((b[ptr+1] & 0xFF) << 8)
+                + ((b[ptr+2] & 0xFF) << 16) + ((b[ptr+3] & 0xFF) << 24);
         _inputPtr = ptr+4;
         return v;
     }

diff --git a/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufTestBase.java b/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufTestBase.java
@@ -453,9 +453,9 @@ protected void assertToken(JsonToken expToken, JsonToken actToken)
         }
     }
 
-    protected void assertToken(JsonToken expToken, JsonParser jp)
+    protected void assertToken(JsonToken expToken, JsonParser p)
     {
-        assertToken(expToken, jp.getCurrentToken());
+        assertToken(expToken, p.getCurrentToken());
     }
 
     protected void assertType(Object ob, Class<?> expType)