Backport #25 fix in 2.4

Author: cowtowncoder

release-notes/CREDITS

@@ -13,6 +13,9 @@ brharrington@github:
   * Reported #17: Boundary error with `float`/`double` values, large content
    (2.4.1)
 
+Lee Yun-young (lseeker@github)
+  * Report #25: Buffer overrun when writing unencoded binary content
+   (2.4.7 / 2.5.5)
 
 mcmahon356@github:
   * Reported 24: Current location does not always updated properly

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-dataformat-smile
 === Releases ===
 ------------------------------------------------------------------------
 
+2.4.7 (not released)
+
+#25: Buffer overrun when trying to write longer binary content
+ (report by Lee Y-Y)
+
 2.4.6 (23-Apr-2015)
 
 #24: Current location does not always updated properly

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

@@ -1904,6 +1904,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