Merge branch '2.19' into issue388

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -363,6 +363,11 @@ Knut Wannheden (@knutwannheden)
  * Contributed #518: Should not read past end for CBOR string values
   (2.18.1)
 
+Steven Fackler (@sfackler)
+ * Reported #300: (smile) Floats are encoded with sign extension while
+   doubles without
+  (2.19.0)
+
 Idan Sheinberg (@sheinbergon)
  * Reported #308: (avro) Incorrect serialization for `LogicalType.Decimal` (Java
    `BigDecimal`)

release-notes/VERSION-2.x

@@ -16,6 +16,8 @@ Active maintainers:
 
 2.19.0 (not yet released)
 
+#300: (smile) Floats are encoded with sign extension while doubles without
+ (reported by Steven F)
 #308: (avro) Incorrect serialization for `LogicalType.Decimal` (Java `BigDecimal`)
  (reported by Idan S)
  (fix contributed by Michal F)

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

@@ -1726,13 +1726,13 @@ public void writeNumber(float f) throws IOException
         int i = Float.floatToRawIntBits(f);
         _outputBuffer[_outputTail++] = TOKEN_BYTE_FLOAT_32;
         _outputBuffer[_outputTail+4] = (byte) (i & 0x7F);
-        i >>= 7;
+        i >>>= 7;
         _outputBuffer[_outputTail+3] = (byte) (i & 0x7F);
-        i >>= 7;
+        i >>>= 7;
         _outputBuffer[_outputTail+2] = (byte) (i & 0x7F);
-        i >>= 7;
+        i >>>= 7;
         _outputBuffer[_outputTail+1] = (byte) (i & 0x7F);
-        i >>= 7;
+        i >>>= 7;
         _outputBuffer[_outputTail] = (byte) (i & 0x7F);
         _outputTail += 5;
     }

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java renamed to smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/SmileGeneratorNumbersTest.java

@@ -1,14 +1,16 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
 import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.dataformat.smile.*;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestGeneratorNumbers
+public class SmileGeneratorNumbersTest
     extends BaseTestForSmile
 {
     @Test
@@ -118,9 +120,9 @@ public void testFloats() throws Exception
     {
         // float length is fixed, 6 bytes
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        SmileGenerator gen = smileGenerator(out, false);
-        gen.writeNumber(0.125f);
-        gen.close();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(0.125f);
+        }
         assertEquals(6, out.toByteArray().length);
     }
 
@@ -129,12 +131,49 @@ public void testDoubles() throws Exception
     {
         // double length is fixed, 11 bytes
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        SmileGenerator gen = smileGenerator(out, false);
-        gen.writeNumber(0.125);
-        gen.close();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(0.125);
+        }
         assertEquals(11, out.toByteArray().length);
     }
 
+    // [dataformats-binary#300]
+    @Test
+    public void testFloatUnusedBits() throws Exception
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(-0f);
+        }
+        byte[] encoded = out.toByteArray();
+        assertEquals(6, encoded.length);
+        assertEquals(0x28, encoded[0]); // type byte, float
+
+        // From 0x80 0x00 0x00 0x00 (spread over 5 x 7bits)
+        assertArrayEquals(new byte[] {
+                0x08, 0x00, 0x00, 0x00, 0x00
+        }, Arrays.copyOfRange(encoded, 1, encoded.length));
+}
+
+    // [dataformats-binary#300]
+    @Test
+    public void testDoubleUnusedBits() throws Exception
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (SmileGenerator gen = smileGenerator(out, false)) {
+            gen.writeNumber(-0d);
+        }
+        byte[] encoded = out.toByteArray();
+        assertEquals(11, encoded.length);
+        assertEquals(0x29, encoded[0]); // type byte, double
+        // From 0x80 0x00 0x00 0x00 ... 0x00 (spread over 10 x 7 bits)
+
+        assertArrayEquals(new byte[] {
+                0x01, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00
+        }, Arrays.copyOfRange(encoded, 1, encoded.length));
+    }
+
     // #16: Problems with 'Stringified' numbers
     @Test
     public void testNumbersAsString() throws Exception