Merge #24 fix in 2.4 branch as well (for 2.4.6, if ever)

Author: cowtowncoder

release-notes/CREDITS

@@ -12,3 +12,8 @@ Steven Schlansker:
 brharrington@github:
   * Reported #17: Boundary error with `float`/`double` values, large content
    (2.4.1)
+
+
+mcmahon356@github:
+  * Reported 24: Current location does not always updated properly
+   (2.5.1)

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-dataformat-smile
 === Releases ===
 ------------------------------------------------------------------------
 
+2.4.6 (not yet released)
+
+#24: Current location does not always updated properly
+ (reported by mcmahon356@github)
+
 2.4.5 (13-Jan-2015)
 2.4.4 (24-Nov-2014)
 2.4.3 (04-Oct-2014)

src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java

@@ -386,16 +386,18 @@ public JsonLocation getCurrentLocation()
     @Override
     protected final boolean loadMore() throws IOException
     {
-        _currInputProcessed += _inputEnd;
         //_currInputRowStart -= _inputEnd;
 
         if (_inputStream != null) {
             int count = _inputStream.read(_inputBuffer, 0, _inputBuffer.length);
+            _currInputProcessed += _inputEnd;
+            _inputPtr = 0;
             if (count > 0) {
-                _inputPtr = 0;
                 _inputEnd = count;
                 return true;
             }
+            // important: move pointer to same as end, to keep location accurate
+            _inputEnd = 0;
             // End of input
             _closeInput();
             // Should never return 0, so let's fail
@@ -418,8 +420,8 @@ protected final void _loadToHaveAtLeast(int minAvailable) throws IOException
         }
         // Need to move remaining data in front?
         int amount = _inputEnd - _inputPtr;
+        _currInputProcessed += _inputPtr;
         if (amount > 0 && _inputPtr > 0) {
-            _currInputProcessed += _inputPtr;
             //_currInputRowStart -= _inputPtr;
             System.arraycopy(_inputBuffer, _inputPtr, _inputBuffer, 0, amount);
             _inputEnd = amount;

src/test/java/com/fasterxml/jackson/dataformat/smile/SmileTestBase.java

@@ -3,13 +3,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Arrays;
 
 import org.junit.Assert;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
@@ -128,14 +128,14 @@ protected byte[] _smileDoc(SmileFactory smileFactory, String json, boolean write
         return out.toByteArray();
     }
 
-    protected SmileGenerator smileGenerator(ByteArrayOutputStream result, boolean addHeader)
+    protected SmileGenerator smileGenerator(OutputStream result, boolean addHeader)
         throws IOException
     {
         return smileGenerator(new SmileFactory(), result, addHeader);
     }
 
     protected SmileGenerator smileGenerator(SmileFactory f,
-            ByteArrayOutputStream result, boolean addHeader)
+            OutputStream result, boolean addHeader)
         throws IOException
     {
         f.configure(SmileGenerator.Feature.WRITE_HEADER, addHeader);

src/test/java/com/fasterxml/jackson/dataformat/smile/TestParserLocation.java

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.dataformat.smile;
 
-import java.io.IOException;
+import java.io.*;
 
 import com.fasterxml.jackson.core.*;
 
@@ -57,4 +57,40 @@ public void testSimpleOffsets() throws IOException
         assertNull(p.nextToken());
         p.close();
     }
+
+    // for [databind-smile#24]
+    public void testAscendingOffsets() throws Exception
+    {
+        // need to create big enough document, say at least 64k
+        // but as importantly, try to create buffer boundaries by using 6-char (7-byte) ASCII strings
+        final int COUNT = 57000;
+        final int SIZE = COUNT * 7;
+        
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream(COUNT + 10);
+        SmileGenerator gen = smileGenerator(bytes, true);
+        gen.disable(SmileGenerator.Feature.CHECK_SHARED_STRING_VALUES);
+        gen.writeStartArray();
+        for (int i = 0; i < COUNT; ++i) {
+            gen.writeString("abc123");
+        }
+        gen.writeEndArray();
+        gen.close();
+        byte[] b = bytes.toByteArray();
+        assertEquals(4 + 2 + SIZE, b.length);
+
+        SmileParser p = _smileParser(new ByteArrayInputStream(b));
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        // 4 byte header, start array read, so 4 bytes down:
+        assertEquals(5, p.getCurrentLocation().getByteOffset());
+        for (int i = 0; i < COUNT; ++i) {
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals(6 + i*7, p.getCurrentLocation().getByteOffset());
+            assertEquals("abc123", p.getText());
+        }
+        assertToken(JsonToken.END_ARRAY, p.nextToken());
+        assertEquals(SIZE+6, p.getCurrentLocation().getByteOffset());
+        assertNull(p.nextToken());
+        assertEquals(SIZE+6, p.getCurrentLocation().getByteOffset());
+        p.close();
+    }
 }