Fix #17, add suggested unit test (and improve other big-data test; must ensure InputStream is used, not byte[])

Author: cowtowncoder

release-notes/CREDITS

@@ -5,7 +5,10 @@ Here are people who have contributed to Smile decoded plug-in development
 Tatu Saloranta, [email protected]: author
 
 Steven Schlansker:
-
   * Reported [Issue-2]: SmileParser failed to properly decoded surrogate-pair
     characters for long strings
    (2.0.2)
+
+brharrington@github:
+  * Reported #17: Boundary error with `float`/`double` values, large content
+   (2.4.1)

release-notes/VERSION

@@ -1,12 +1,17 @@
 Project: jackson-dataformat-smile
-Version: 2.4.0 (02-Jun-2014)
+Version: 2.4.1 (xx-Jun-2014)
 
-#16: Support handling of "Stringified" numbers
+#17: Boundary error with `float`/`double` values, large content
+ (reported by brharrington@github)
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+2.4.0 (02-Jun-2014)
+
+#16: Support handling of "Stringified" numbers
+
 2.3.2 (01-Mar-2014)
 
 #15: Problem with SmileGenerator._writeBytes(...), bounds checks

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

@@ -2055,6 +2055,9 @@ private final int _fourBytesToInt()  throws IOException
 
     private final int _fourBytesToIntSlow()  throws IOException
     {
+        if (_inputPtr >= _inputEnd) {
+            loadMoreGuaranteed();
+        }
         int i = _inputBuffer[_inputPtr++]; // first 7 bits
         if (_inputPtr >= _inputEnd) {
             loadMoreGuaranteed();

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

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.smile;
 
+import java.io.*;
 import java.util.*;
 
 import com.fasterxml.jackson.databind.*;
@@ -121,7 +122,8 @@ public void testRoundTrip() throws Exception
 		ObjectMapper mapper = smileMapper(false);
 
 		byte[] smile1 = mapper.writeValueAsBytes(citm);
-		Citm citm2 = mapper.readValue(smile1, Citm.class);
+		// IMPORTANT: use InputStream so boundary conditions are actually checked
+		Citm citm2 = mapper.readValue(new ByteArrayInputStream(smile1), Citm.class);
 		byte[] smile2 = mapper.writeValueAsBytes(citm2);
 
 		assertEquals(smile1.length, smile2.length);
@@ -138,4 +140,34 @@ public void testRoundTrip() throws Exception
 		assertEquals(citm.topicSubTopics.size(), citm2.topicSubTopics.size());
 		assertEquals(citm.venueNames.size(), citm2.venueNames.size());
 	}
+
+	  public void testIssue17BoundaryWithFloat() throws Exception
+	  {
+	      _testWithFloats(false);
+           _testWithFloats(true);
+	  }
+
+	  private void _testWithFloats(boolean useHeader) throws Exception
+	  {
+           double[] data = new double[4096];
+           for (int i = 0; i < data.length; ++i) {
+               data[i] = (double) i;
+           }
+	      ObjectMapper mapper = smileMapper(useHeader);
+	      byte[] encoded = mapper.writeValueAsBytes(data);
+
+           // first, read from byte array; no boundary
+	      double[] decoded = mapper.readValue(encoded, double[].class);
+	      assertEquals(data.length, decoded.length);
+	      
+	      // and then via InputStream
+	      decoded = mapper.readValue(new ByteArrayInputStream(encoded), double[].class); // This fails on 2.4.0
+           assertEquals(data.length, decoded.length);
+
+           for (int i = 0; i < data.length; ++i) {
+               if (data[i] != decoded[i]) {
+                   assertEquals("Different value at #"+i, data[i], decoded[i]);
+               }
+           }
+	  }
 }

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

@@ -84,7 +84,7 @@ protected ObjectMapper smileMapper() {
     }
 
     protected ObjectMapper smileMapper(boolean requireHeader) {
-        return smileMapper(requireHeader, false, false);
+        return smileMapper(requireHeader, requireHeader, false);
     }
 
     protected ObjectMapper smileMapper(boolean requireHeader,