Merge branch '2.17'

FasterXML · Feb 13, 2024 · 3ea88fc · 3ea88fc
2 parents e9eb64b + 10753a0
commit 3ea88fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java b/cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java
@@ -2554,7 +2554,7 @@ private final String _finishLongText(int len) throws JacksonException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outEnd) {
@@ -2657,7 +2657,7 @@ private final void _finishChunkedText() throws JacksonException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outEnd) {
@@ -3900,14 +3900,6 @@ protected void _reportUnexpectedBreak() throws StreamReadException {
                 +(_streamReadContext.inObject() ? "Object" : "Array" ));
     }
 
-    protected void _reportInvalidChar(int c) throws StreamReadException {
-        // Either invalid WS or illegal UTF-8 start char
-        if (c < ' ') {
-            _throwInvalidSpace(c);
-        }
-        _reportInvalidInitial(c);
-    }
-
     protected void _reportInvalidInitial(int mask) throws StreamReadException {
         _reportError("Invalid UTF-8 start byte 0x"+Integer.toHexString(mask));
     }

diff --git a/smile/src/main/java/tools/jackson/dataformat/smile/SmileParser.java b/smile/src/main/java/tools/jackson/dataformat/smile/SmileParser.java
@@ -2903,7 +2903,7 @@ private final void _decodeLongUnicodeValue() throws JacksonException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outBuf.length) {
@@ -3373,15 +3373,6 @@ protected void _reportInvalidSharedStringValue(int index) throws StreamReadExcep
                 index, _seenStringValueCount);
     }
 
-    protected void _reportInvalidChar(int c) throws StreamReadException
-    {
-        // Either invalid WS or illegal UTF-8 start char
-        if (c < ' ') {
-            _throwInvalidSpace(c);
-        }
-        _reportInvalidInitial(c);
-    }
-
     protected void _reportInvalidInitial(int mask) throws StreamReadException {
         throw _constructReadException("Invalid UTF-8 start byte 0x02X", mask);
     }