...

Author: cowtowncoder

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

@@ -1898,7 +1898,7 @@ protected final void _finishToken() throws IOException
                 _binaryValue = _read7BitBinaryWithLength();
                 return;
             case 7: // binary, raw
-                _binaryValue = _finishRawBinary();
+                _binaryValue = _finishBinaryRaw();
                 return;
             }
         }
@@ -2441,14 +2441,16 @@ private final void _decodeLongUnicode() throws IOException
     /**********************************************************************
      */
 
-    private final byte[] _finishRawBinary() throws IOException
+    // Helper method for reading complete binary data value from "raw"
+    // value (regular byte-per-byte)
+    private final byte[] _finishBinaryRaw() throws IOException
     {
         int byteLen = _readUnsignedVInt();
 
         // 20-Mar-2021, tatu [dataformats-binary#260]: avoid eager allocation
         //   for very large content
         if (byteLen > LONGEST_NON_CHUNKED_BINARY) {
-            return _finishRawBinaryLong(byteLen);
+            return _finishBinaryRawLong(byteLen);
         }
 
         // But use simpler, no intermediate buffering, for more compact cases
@@ -2478,7 +2480,7 @@ private final byte[] _finishRawBinary() throws IOException
     }
 
     // @since 2.12.3
-    protected byte[] _finishRawBinaryLong(final int expLen) throws IOException
+    protected byte[] _finishBinaryRawLong(final int expLen) throws IOException
     {
         int left = expLen;
 
@@ -2509,9 +2511,16 @@ protected byte[] _finishRawBinaryLong(final int expLen) throws IOException
     private final byte[] _read7BitBinaryWithLength() throws IOException
     {
         int byteLen = _readUnsignedVInt();
-        byte[] result = new byte[byteLen];
+
+        // 20-Mar-2021, tatu [dataformats-binary#260]: avoid eager allocation
+        //   for very large content
+        if (byteLen > LONGEST_NON_CHUNKED_BINARY) {
+//            return _finishBinary7BitLong(byteLen);
+        }
+
+        final byte[] result = new byte[byteLen];
+        final int lastOkPtr = byteLen - 7;
         int ptr = 0;
-        int lastOkPtr = byteLen - 7;
 
         // first, read all 7-by-8 byte chunks
         while (ptr <= lastOkPtr) {
@@ -2555,10 +2564,16 @@ private final byte[] _read7BitBinaryWithLength() throws IOException
         return result;
     }
 
+    // @since 2.12.3
+    protected byte[] _finishBinary7BitLong(final int expLen) throws IOException
+    {
+        return null;
+    }
+
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Internal methods, skipping
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**