Merge branch '2.8' into 2.9

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -159,3 +159,7 @@ Doug Roper (htmldoug@github)
 Alexander Eyers-Taylor (aeyerstaylor@github)
   * Reported #510: Fix ArrayIndexOutofBoundsException found by LGTM.com
   (2.9.9)
+
+Henrik Gustafsson (gsson@github)
+  * Reported #516: _inputPtr off-by-one in UTF8StreamJsonParser._parseNumber2()
+  (2.9.9)

release-notes/VERSION-2.x

@@ -14,6 +14,11 @@ JSON library.
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.9 (not yet released)
+
+#516: _inputPtr off-by-one in UTF8StreamJsonParser._parseNumber2()
+ (reported by Henrik G)
+
 2.9.8 (15-Dec-2018)
 
 #488: Fail earlier on coercions from "too big" `BigInteger` into

src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java

@@ -1467,7 +1467,7 @@ private final JsonToken _parseNumber2(char[] outBuf, int outPtr, boolean negativ
         _textBuffer.setCurrentLength(outPtr);
         // As per #105, need separating space between root values; check here
         if (_parsingContext.inRoot()) {
-            _verifyRootSpace(_inputBuffer[_inputPtr++] & 0xFF);
+            _verifyRootSpace(_inputBuffer[_inputPtr] & 0xFF);
         }
 
         // And there we have it!

src/test/java/com/fasterxml/jackson/core/json/TestRootValues.java

@@ -79,7 +79,7 @@ public void testSimpleWrites() throws Exception
         _testSimpleWrites(true);
     }
 
-    public void _testSimpleWrites(boolean useStream) throws Exception
+    private void _testSimpleWrites(boolean useStream) throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         StringWriter w = new StringWriter();
@@ -102,4 +102,102 @@ public void _testSimpleWrites(boolean useStream) throws Exception
         String json = useStream ? out.toString("UTF-8") : w.toString();
         assertEquals("123 \"abc\" true", json);
     }
+
+    // [core#516]: Off-by-one read problem
+    public void testRootOffsetIssue516Bytes() throws Exception
+    {
+        // InputStream that forces _parseNumber2 to be invoked.
+        final InputStream in = new Issue516InputStream(new byte[][] {
+            "1234".getBytes("UTF-8"),
+            "5 true".getBytes("UTF-8")
+        });
+
+        JsonParser parser = JSON_F.createParser(in);
+        assertEquals(12345, parser.nextIntValue(0));
+
+        // Fails with com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'rue': was expecting ('true', 'false' or 'null')
+        assertTrue(parser.nextBooleanValue());
+
+        parser.close();
+        in.close();
+    }
+
+    // [core#516]: Off-by-one read problem
+    public void testRootOffsetIssue516Chars() throws Exception
+    {
+        // InputStream that forces _parseNumber2 to be invoked.
+        final Reader in = new Issue516Reader(new char[][] {
+            "1234".toCharArray(), "5 true".toCharArray()
+        });
+
+        JsonParser parser = JSON_F.createParser(in);
+        assertEquals(12345, parser.nextIntValue(0));
+
+        // Fails with com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'rue': was expecting ('true', 'false' or 'null')
+        assertTrue(parser.nextBooleanValue());
+
+        parser.close();
+        in.close();
+    }
+
+    static class Issue516InputStream extends InputStream
+    {
+        private final byte[][] reads;
+        private int currentRead;
+
+        public Issue516InputStream(byte[][] reads) {
+            this.reads = reads;
+            this.currentRead = 0;
+        }
+
+        @Override
+        public int read() throws IOException {
+            throw new UnsupportedOperationException();
+        }
+    
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (currentRead >= reads.length) {
+                return -1;
+            }
+            byte[] bytes = reads[currentRead++];
+            if (len < bytes.length) {
+                throw new IllegalArgumentException();
+            }
+            System.arraycopy(bytes, 0, b, off, bytes.length);
+            return bytes.length;
+        }
+    }
+
+    static class Issue516Reader extends Reader
+    {
+        private final char[][] reads;
+        private int currentRead;
+
+        public Issue516Reader(char[][] reads) {
+            this.reads = reads;
+            this.currentRead = 0;
+        }
+
+        @Override
+        public void close() { }
+
+        @Override
+        public int read() throws IOException {
+            throw new UnsupportedOperationException();
+        }
+    
+        @Override
+        public int read(char[] b, int off, int len) throws IOException {
+            if (currentRead >= reads.length) {
+                return -1;
+            }
+            char[] bytes = reads[currentRead++];
+            if (len < bytes.length) {
+                throw new IllegalArgumentException();
+            }
+            System.arraycopy(bytes, 0, b, off, bytes.length);
+            return bytes.length;
+        }
+    }
 }