Merge branch '2.5' into 2.6

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-dataformat-cbor
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.6 (not yet released)
+
+#18: Correct parsing of zero length byte strings
+ (reported, fix suggested by philipa@github)
+
 2.6.5 (19-Jan-2016)
 
 #15: CBORParser.getNumberType returns DOUBLE even if the generator has been fed with a float
@@ -24,6 +29,7 @@ No changes since 2.6.2
 
 No changes since 2.5
 
+2.5.5 (07-Dec-2015)
 2.5.4 (09-Jun-2015)
 2.5.3 (24-Apr-2015)
 2.5.2 (29-Mar-2015)

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

@@ -17,6 +17,8 @@
 
 public final class CBORParser extends ParserMinimalBase
 {
+    private final static byte[] NO_BYTES = new byte[0];
+    
     /**
      * Enumeration that defines all togglable features for CBOR generators.
      */
@@ -2078,6 +2080,9 @@ protected byte[] _finishBytes(int len) throws IOException
     {
         // First, simple: non-chunked
         if (len >= 0) {
+            if (len == 0) {
+                return NO_BYTES;
+            }
             byte[] b = new byte[len];
             if (_inputPtr >= _inputEnd) {
                 loadMoreGuaranteed();

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

@@ -20,6 +20,7 @@ public Bytes() { }
     private final ObjectMapper MAPPER = cborMapper();
 
     public void testSmallBinaryValues() throws Exception {
+        _testBinary(0);
         _testBinary(1);
         _testBinary(20);
         _testBinary(100);