One minor change wrt #257 to allow zero-length BigInteger represent…

…ation for BigInteger.ZERO
FasterXML · Mar 19, 2021 · 467b8ce · 467b8ce
1 parent aeac2f1
commit 467b8ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java b/smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java
@@ -2101,11 +2101,12 @@ private final int _fourBytesToIntSlow()  throws IOException
     private final void _finishBigInteger() throws IOException
     {
         byte[] raw = _read7BitBinaryWithLength();
+        // [dataformats-binary#257]: 0-length special case to handle
         if (raw.length == 0) {
-            // [dataformats-binary#257]: illegal to have 0-length contents
-            _reportError("Invalid encoding of `BigInteger`: length 0");
+            _numberBigInt = BigInteger.ZERO;
+        } else {
+            _numberBigInt = new BigInteger(raw);
         }
-        _numberBigInt = new BigInteger(raw);
         _numTypesValid = NR_BIGINT;
         _numberType = NumberType.BIG_INTEGER;
     }
@@ -2147,11 +2148,13 @@ private final void _finishBigDecimal() throws IOException
     {
         int scale = SmileUtil.zigzagDecode(_readUnsignedVInt());
         byte[] raw = _read7BitBinaryWithLength();
+        // [dataformats-binary#257]: 0-length special case to handle
         if (raw.length == 0) {
-            // [dataformats-binary#257]: illegal to have 0-length contents
-            _reportError("Invalid encoding of `BigDecimal` value: length 0");
+            _numberBigDecimal = BigDecimal.ZERO;
+        } else {
+            BigInteger unscaledValue = new BigInteger(raw);
+            _numberBigDecimal = new BigDecimal(unscaledValue, scale);
         }
-        _numberBigDecimal = new BigDecimal(new BigInteger(raw), scale);
         _numTypesValid = NR_BIGDECIMAL;
         _numberType = NumberType.BIG_DECIMAL;
     }

diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java
@@ -1,7 +1,8 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
-import com.fasterxml.jackson.core.exc.StreamReadException;
+import java.math.BigDecimal;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
@@ -20,11 +21,9 @@ public void testInvalidBigDecimal() throws Exception
                 (byte) 0xBF, // scale: -32
                 (byte) 0x80 // length: 0 (invalid
         };
-        try {
-            /*JsonNode root =*/ MAPPER.readTree(input);
-            fail("Should not pass");
-        } catch (StreamReadException e) {
-            verifyException(e, "Invalid encoding of `BigDecimal` value: length 0");
-        }
+        JsonNode root = MAPPER.readTree(input);
+        assertTrue(root.isNumber());
+        assertTrue(root.isBigDecimal());
+        assertEquals(BigDecimal.ZERO, root.decimalValue());
     }
 }