Merge branch '2.5'

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

Author: cowtowncoder

release-notes/VERSION

@@ -4,6 +4,10 @@ Project: jackson-dataformat-cbor
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.2-1 (19-Aug-2015)
+
+#13: Bug in boundary checking in the CBORParser
+
 2.6.1 (09-Aug-2015)
 2.6.0 (19-Jul-2015)
 

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

@@ -8,8 +8,9 @@
 import java.io.IOException;
 import java.io.SequenceInputStream;
 
-public class ParserInputStreamTest extends CBORTestBase {
-
+// for [dataformat-cbor#13]
+public class ParserInputStreamTest extends CBORTestBase
+{
     @Test
     public void testInpuStream() throws Exception {
         CBORFactory f = new CBORFactory();
@@ -28,13 +29,8 @@ public void testInpuStream() throws Exception {
         ByteArrayInputStream in2 = new ByteArrayInputStream(buf2);
         SequenceInputStream inputStream = new SequenceInputStream(in1, in2);
 
-        try {
-            JsonNode jsonNode = cborMapper.readTree(inputStream);
-        }
-        catch (ArrayIndexOutOfBoundsException ex){
-            ex.printStackTrace();
-            fail("Shouldn't throw an ArrayIndexOutOfBoundsException while parsing!");
-        }
+        JsonNode jsonNode = cborMapper.readTree(inputStream);
+        assertNotNull(jsonNode);
     }
 
     private byte[] generateHugeCBOR(CBORFactory f) throws IOException {