Fix #178

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -3052,13 +3052,14 @@ protected final void _loadToHaveAtLeast(int minAvailable) throws IOException
         // Need to move remaining data in front?
         int amount = _inputEnd - _inputPtr;
         if (amount > 0 && _inputPtr > 0) {
-            _currInputProcessed += _inputPtr;
             //_currInputRowStart -= _inputPtr;
             System.arraycopy(_inputBuffer, _inputPtr, _inputBuffer, 0, amount);
             _inputEnd = amount;
         } else {
             _inputEnd = 0;
         }
+        // Needs to be done here, as per [dataformats-binary#178]
+        _currInputProcessed += _inputPtr;
         _inputPtr = 0;
         while (_inputEnd < minAvailable) {
             int count = _inputStream.read(_inputBuffer, _inputEnd, _inputBuffer.length - _inputEnd);

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORTestBase.java

@@ -53,7 +53,7 @@ protected byte[] cborDoc(String json) throws IOException {
         return cborDoc(cborFactory(), json);
     }
 
-    protected byte[] cborDoc(CBORFactory cborF, String json) throws IOException
+    protected byte[] cborDoc(TokenStreamFactory cborF, String json) throws IOException
     {
         JsonFactory jf = new JsonFactory();
         JsonParser p = jf.createParser(json);

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/ParserInputStreamTest.java

@@ -1,21 +1,23 @@
 package com.fasterxml.jackson.dataformat.cbor;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.SequenceInputStream;
 
-// for [dataformat-cbor#13]
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class ParserInputStreamTest extends CBORTestBase
 {
-    @Test
+    private final ObjectMapper MAPPER = cborMapper();
+
+    // for [dataformat-cbor#13]
     public void testInpuStream() throws Exception {
-        CBORFactory f = new CBORFactory();
-        ObjectMapper cborMapper = new ObjectMapper(new CBORFactory());
-        byte[] buffer = generateHugeCBOR(f);
+        byte[] buffer = generateHugeCBOR(MAPPER.getFactory());
 
         // split the buffer in two smaller buffer
         int len = 160;
@@ -29,11 +31,34 @@ public void testInpuStream() throws Exception {
         ByteArrayInputStream in2 = new ByteArrayInputStream(buf2);
         SequenceInputStream inputStream = new SequenceInputStream(in1, in2);
 
-        JsonNode jsonNode = cborMapper.readTree(inputStream);
+        JsonNode jsonNode = MAPPER.readTree(inputStream);
         assertNotNull(jsonNode);
     }
 
-    private byte[] generateHugeCBOR(CBORFactory f) throws IOException {
+    public void testInputStreamWithHugeValueThatOverlaps() throws Exception {
+        final byte[] buffer = new byte[8002];
+        buffer[0] = 0x79; // string length 7996 + 3 init bytes
+        buffer[1] = 0x1f;
+        buffer[2] = 0x3c;
+        buffer[7999] = 0x61; // string length 1 + 1 init byte
+
+        final InputStream in = new ByteArrayInputStream(buffer);
+        final JsonParser parser = MAPPER.getFactory().createParser(in);
+
+        parser.nextToken();
+        parser.finishToken();
+
+        final long start = parser.getCurrentLocation().getByteOffset();
+        assertEquals(7999, start);
+
+        parser.nextToken();
+        parser.finishToken();
+
+        final long end = parser.getCurrentLocation().getByteOffset();
+        assertEquals(8001, end);
+    }
+
+    private byte[] generateHugeCBOR(JsonFactory f) throws IOException {
         String hugeJson = "{";
         for (char c='a'; c <= 'z'; c++) {
             for (char cc='a'; cc <= 'z'; cc++) {

release-notes/CREDITS-2.x

@@ -105,5 +105,6 @@ Marcos Passos (marcospassos@github)
 * Contributed fix for #173: (Avro) Improve Union type serialization performance
  (2.10.0)
 
-
-
+John (iziamos@github)
+* Reported, suggested fix for #178: Fix issue wit input offsets when parsing CBOR from `InputStream`
+ (2.10.0)

release-notes/VERSION-2.x

@@ -12,6 +12,8 @@ Project: jackson-datatypes-binaryModules:
 
 #148: (protobuf) Add `ProtobufMapper.generateSchemaFor(TypeReference<?>)` overload
  (suggested by MrThreepwood@github)
+#178: Fix issue wit input offsets when parsing CBOR from `InputStream`
+ (reported by iziamos@github)
 
 2.10.0.pr2 (31-Aug-2019)