Merge branch '2.10'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -23,11 +23,18 @@ JSON library.
 #484: Implement `UTF8JsonGenerator.writeRawValue(SerializableString)` (and
   `writeRaw(..)`) more efficiently
 
+2.9.8 (not yet released)
+
+#488: Fail earlier on coercions from "too big" `BigInteger` into
+  fixed-size types (`int`, `long`, `short`)
+
 2.9.7 (19-Sep-2018)
 
 #476: Problem with `BufferRecycler` via async parser (or when sharing parser
  across threads)
 #477: Exception while decoding Base64 value with escaped `=` character
+#488: Fail earlier on coercions from "too big" `BigInteger` into
+  fixed-size types (`int`, `long`, `short`)
 
 2.9.6 (12-Jun-2018)
 

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

@@ -773,7 +773,7 @@ private void _parseSlowFloat(int expType) throws IOException
             }
         } catch (NumberFormatException nex) {
             // Can this ever occur? Due to overflow, maybe?
-            _wrapError("Malformed numeric value '"+_textBuffer.contentsAsString()+"'", nex);
+            _wrapError("Malformed numeric value ("+_longNumberDesc(_textBuffer.contentsAsString())+")", nex);
         }
     }
 
@@ -808,23 +808,14 @@ private void _parseSlowInt(int expType) throws IOException
             }
         } catch (NumberFormatException nex) {
             // Can this ever occur? Due to overflow, maybe?
-            _wrapError("Malformed numeric value '"+numStr+"'", nex);
+            _wrapError("Malformed numeric value ("+_longNumberDesc(numStr)+")", nex);
         }
     }
 
     // @since 2.9.8
     protected void _reportTooLongInt(int expType, String rawNum) throws IOException
     {
-        int rawLen = rawNum.length();
-        final String numDesc;
-        if (rawLen < 1000) {
-            numDesc = rawNum;
-        } else {
-            if (rawNum.startsWith("-")) {
-                rawLen -= 1;
-            }
-            numDesc = String.format("[Integer with %d digits]", rawLen);
-        }
+        final String numDesc = _longIntegerDesc(rawNum);
         _reportError("Numeric value (%s) out of range of %s", numDesc,
                 (expType == NR_LONG) ? "long" : "int");
     }

src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java

@@ -668,12 +668,36 @@ protected void reportInvalidNumber(String msg) throws JsonParseException {
 
     protected void reportOverflowInt() throws IOException {
         _reportError(String.format("Numeric value (%s) out of range of int (%d - %s)",
-                getText(), Integer.MIN_VALUE, Integer.MAX_VALUE));
+                _longIntegerDesc(getText()), Integer.MIN_VALUE, Integer.MAX_VALUE));
     }
-    
+
     protected void reportOverflowLong() throws IOException {
         _reportError(String.format("Numeric value (%s) out of range of long (%d - %s)",
-                getText(), Long.MIN_VALUE, Long.MAX_VALUE));
+                _longIntegerDesc(getText()), Long.MIN_VALUE, Long.MAX_VALUE));
+    }
+
+    // @since 2.9.8
+    protected String _longIntegerDesc(String rawNum) {
+        int rawLen = rawNum.length();
+        if (rawLen < 1000) {
+            return rawNum;
+        }
+        if (rawNum.startsWith("-")) {
+            rawLen -= 1;
+        }
+        return String.format("[Integer with %d digits]", rawLen);
+    }
+
+    // @since 2.9.8
+    protected String _longNumberDesc(String rawNum) {
+        int rawLen = rawNum.length();
+        if (rawLen < 1000) {
+            return rawNum;
+        }
+        if (rawNum.startsWith("-")) {
+            rawLen -= 1;
+        }
+        return String.format("[number with %d characters]", rawLen);
     }
 
     protected void _reportUnexpectedChar(int ch, String comment) throws JsonParseException

src/test/java/com/fasterxml/jackson/core/read/NumberOverflowTest.java

@@ -23,7 +23,7 @@ public class NumberOverflowTest
 
     private final static String BIG_POS_DOC = "["+BIG_POS_INTEGER+"]";
     private final static String BIG_NEG_DOC = "[ -"+BIG_POS_INTEGER+"]";
-    
+
     public void testSimpleLongOverflow() throws Exception
     {
         BigInteger below = BigInteger.valueOf(Long.MIN_VALUE);
@@ -54,13 +54,12 @@ public void testSimpleLongOverflow() throws Exception
                 verifyException(e, "out of range of long");
             }
             p.close();
-            
         }
     }
 
     // Note: only 4 cardinal types; `short`, `byte` and `char` use same code paths
     // Note: due to [jackson-core#493], we'll skip DataInput-backed parser
-    
+
     // [jackson-core#488]
     public void testMaliciousLongOverflow() throws Exception
     {