commit 9af315f19282d7a6432ff505efbdc9a4cfa20203
author cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Thu Feb 14 02:47:43 2013 +0000
committer cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Thu Feb 14 02:47:43 2013 +0000
tree f8bba5a8a78ed5018e41327d2cbe501a33e788b1
parent 77fe983586e0ec85db68a3fa400c36bb9352cf5b

Fix [JACKSON-889] for 1.9.x

release-notes/VERSION

diff --git a/release-notes/VERSION b/release-notes/VERSION
index 8a7494a..cfffe0e 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -7,6 +7,7 @@
 
 * [JACKSON-887]: StackOverflow with parameterized sub-class field
  (reported by Alexander M)
+* [JACKSON-889]: Parsing error in 'nextFieldName()'
 
 ------------------------------------------------------------------------
 === History: ===

src/java/org/codehaus/jackson/impl/Utf8StreamParser.java

diff --git a/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java b/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
index 2c3db93..9ff753e 100644
--- a/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
+++ b/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
@@ -730,7 +730,7 @@
     {
         // very first thing: common case, colon, value, no white space
         int i;
-        if (_inputPtr < _inputEnd && _inputBuffer[_inputPtr] == INT_COLON) { // fast case first
+        if (_inputPtr < (_inputEnd-1) && _inputBuffer[_inputPtr] == INT_COLON) { // fast case first
             ++_inputPtr;
             i = _inputBuffer[_inputPtr++];
             if (i == INT_QUOTE) {

src/test/org/codehaus/jackson/impl/TestUtf8Parser.java

diff --git a/src/test/org/codehaus/jackson/impl/TestUtf8Parser.java b/src/test/org/codehaus/jackson/impl/TestUtf8Parser.java
index a7c7771..002e683 100644
--- a/src/test/org/codehaus/jackson/impl/TestUtf8Parser.java
+++ b/src/test/org/codehaus/jackson/impl/TestUtf8Parser.java
@@ -3,6 +3,7 @@
 import main.BaseTest;
 
 import org.codehaus.jackson.*;
+import org.codehaus.jackson.io.SerializedString;
 
 import java.io.*;
 import java.util.Random;
@@ -168,4 +169,26 @@
         assertEquals(VALUE, act);
         jp.close();
     }
+
+    // [JACKSON-889]
+    public void testNextFieldName() throws IOException
+    {
+        JsonFactory f = new JsonFactory();
+        SerializedString id = new SerializedString("id");
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        os.write('{');
+        for (int i = 0; i < 3994; i++) {
+            os.write(' ');
+        }
+        os.write("\"id\":2".getBytes("UTF-8"));
+        os.write('}');
+
+        JsonParser parser = f.createJsonParser(new ByteArrayInputStream(os.toByteArray()));
+        assertEquals(parser.nextToken(), JsonToken.START_OBJECT);
+        assertTrue(parser.nextFieldName(id));
+        assertEquals(parser.nextToken(), JsonToken.VALUE_NUMBER_INT);
+        assertEquals(parser.nextToken(), JsonToken.END_OBJECT);
+        parser.close();
+    }
 }