Backport #25 fix, prepare for 2.3.5.1 for smile module

Author: cowtowncoder

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-smile</artifactId>
-  <version>2.3.6-SNAPSHOT</version>
+  <version>2.3.5.1-SNAPSHOT</version>
   <name>Jackson-dataformat-Smile</name>
   <packaging>bundle</packaging>
   <description>Support for reading and writing Smile ("binary JSON")

release-notes/VERSION

@@ -4,9 +4,10 @@ Project: jackson-dataformat-smile
 === History: ===
 ------------------------------------------------------------------------
 
-2.3.6 (not yet released)
+2.3.5.1 (15-Jul-2015)
 
 #24: Current location does not always updated properly
+#25: Buffer overwrite with longer unencoded binary content
 
 2.3.5 (14-Jan-2015)
 

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

@@ -1849,6 +1849,9 @@ private final int _writeBytes(InputStream in, int bytesLeft) throws IOException
                 _flushBuffer();
                 room = _outputEnd - _outputTail;
             }
+            if (room > bytesLeft) {
+                room = bytesLeft;
+            }
             int count = in.read(_outputBuffer, _outputTail, room);
             if (count < 0) {
                 break;

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

@@ -5,6 +5,7 @@
 import org.junit.Assert;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 
 public class TestSmileGeneratorBinary extends SmileTestBase
 {
@@ -60,6 +61,37 @@ public void testBinaryWithoutLength() throws Exception
         jg.close();
     }
 
+    public void testStreamingBinaryPartly() throws Exception {
+    	_testStreamingBinaryPartly(true);
+    	_testStreamingBinaryPartly(false);
+    }
+    
+    private void _testStreamingBinaryPartly(boolean rawBinary) throws Exception
+    {
+    	final SmileFactory f = new SmileFactory();
+    	f.configure(Feature.ENCODE_BINARY_AS_7BIT, rawBinary);
+    	
+    	final byte[] INPUT = TEXT4.getBytes("UTF-8");
+    	ByteArrayInputStream in = new ByteArrayInputStream(INPUT);
+    	
+    	ByteArrayOutputStream out = new ByteArrayOutputStream();
+    	JsonGenerator jg = f.createGenerator(out);
+    	jg.writeStartArray();
+    	jg.writeBinary(in, 1);
+    	jg.writeEndArray();
+    	jg.close();
+    	in.close();
+    	
+        JsonParser jp = f.createParser(out.toByteArray());
+        assertToken(JsonToken.START_ARRAY, jp.nextToken());
+        assertToken(JsonToken.VALUE_EMBEDDED_OBJECT, jp.nextToken());
+        byte[] b = jp.getBinaryValue();
+        assertToken(JsonToken.END_ARRAY, jp.nextToken());
+        jp.close();
+    	
+    	assertEquals(1, b.length);
+    }
+    
     /*
     /**********************************************************
     /* Helper methods