Skip to content

Commit

Permalink
Fix #912: use requiresPaddingOnRead() instead of usesPadding() (#922
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@cowtowncoder
cowtowncoder committed Feb 17, 2023
1 parent bfee8e2 commit e66d2fe
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out, byte[] buf
if (ch == '"') {
decodedData >>= 4;
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -634,7 +634,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out, byte[] buf
decodedData >>= 2;
buffer[outputPtr++] = (byte) (decodedData >> 8);
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -2896,7 +2896,7 @@ protected byte[] _decodeBase64(Base64Variant b64variant) throws IOException
if (ch == '"') {
decodedData >>= 4;
builder.append(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -2936,7 +2936,7 @@ protected byte[] _decodeBase64(Base64Variant b64variant) throws IOException
if (ch == '"') {
decodedData >>= 2;
builder.appendTwoBytes(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/fasterxml/jackson/core/json/UTF8DataInputJsonParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out,
if (ch == INT_QUOTE) {
decodedData >>= 4;
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
_handleBase64MissingPadding(b64variant);
}
break;
Expand Down Expand Up @@ -539,7 +539,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out,
decodedData >>= 2;
buffer[outputPtr++] = (byte) (decodedData >> 8);
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
_handleBase64MissingPadding(b64variant);
}
break;
Expand Down Expand Up @@ -2906,7 +2906,7 @@ protected final byte[] _decodeBase64(Base64Variant b64variant) throws IOExceptio
if (ch == INT_QUOTE) {
decodedData >>= 4;
builder.append(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
_handleBase64MissingPadding(b64variant);
}
return builder.toByteArray();
Expand Down Expand Up @@ -2938,7 +2938,7 @@ protected final byte[] _decodeBase64(Base64Variant b64variant) throws IOExceptio
if (ch == INT_QUOTE) {
decodedData >>= 2;
builder.appendTwoBytes(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
_handleBase64MissingPadding(b64variant);
}
return builder.toByteArray();
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out,
if (ch == INT_QUOTE) {
decodedData >>= 4;
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -692,7 +692,7 @@ protected int _readBinary(Base64Variant b64variant, OutputStream out,
decodedData >>= 2;
buffer[outputPtr++] = (byte) (decodedData >> 8);
buffer[outputPtr++] = (byte) decodedData;
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -3786,7 +3786,7 @@ protected final byte[] _decodeBase64(Base64Variant b64variant) throws IOExceptio
if (ch == INT_QUOTE) {
decodedData >>= 4;
builder.append(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down Expand Up @@ -3825,7 +3825,7 @@ protected final byte[] _decodeBase64(Base64Variant b64variant) throws IOExceptio
if (ch == INT_QUOTE) {
decodedData >>= 2;
builder.appendTwoBytes(decodedData);
if (b64variant.usesPadding()) {
if (b64variant.requiresPaddingOnRead()) {
--_inputPtr; // to keep parser state bit more consistent
_handleBase64MissingPadding(b64variant);
}
Expand Down
40 changes: 40 additions & 0 deletions src/test/java/com/fasterxml/jackson/core/base64/Base64Padding912Test.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.fasterxml.jackson.core.base64;

import com.fasterxml.jackson.core.*;

public class Base64Padding912Test
extends com.fasterxml.jackson.core.BaseTest
{
private final JsonFactory JSON_F = newStreamFactory();

public void testPaddingUsingInputStream() throws Exception
{
_testPadding(MODE_INPUT_STREAM);
_testPadding(MODE_INPUT_STREAM_THROTTLED);
}

public void testPaddingUsingReader() throws Exception
{
_testPadding(MODE_READER);
}

public void testPaddingUsingDataInput() throws Exception
{
_testPadding(MODE_DATA_INPUT);
}

private void _testPadding(int mode) throws Exception
{
Base64Variant b64v = Base64Variants.MIME_NO_LINEFEEDS
.withReadPadding(Base64Variant.PaddingReadBehaviour.PADDING_ALLOWED);
String json = "{\"diff\" : \"1sPEAASBOGM6XGFwYWNoZV9yb290X2Rldlx0bXBcX3N0YXBsZXJcNHEydHJhY3ZcYXZhc3RfZnJlZV9hbnRpdmlydXNfc2V0dXBfb25saW5lLmV4ZS8vYzpcYXBhY2hlX3Jvb3RfZGV2XHN0b3JhZ2VcY1w3XDFcYzcxZmViMTA2NDA5MTE4NzIwOGI4MGNkM2Q0NWE0YThcYXZhc3RfZnJlZV9hbnRpdmlydXNfc2V0dXBfb25saW5lLmV4ZS8FkK0pAKA2kLFgAJsXgyyBZfkKWXg6OZiYBgBYCQCASAAAgAMAAAC4AACABgEAgAoAAABYCACADgAAAJgIAIAQAAAA2AgAgBgAAAAYCWgAAIDJAAAAkHgJAwAqDwCoAAAAqBgDAIwOAAUAAQAAAPAAAIACAUABAIAEAQCABQEIAQAAOCcDAEAhADABAAB4SAMAKFgBAACgigMAqCUAAQAASLADAKgBAADwwAMAaAQAFQA\"}";
try (JsonParser p = createParser(JSON_F, mode, json)) {
assertToken(JsonToken.START_OBJECT, p.nextToken());
assertEquals("diff", p.nextFieldName());
assertToken(JsonToken.VALUE_STRING, p.nextToken());
byte[] b = p.getBinaryValue(b64v);
assertNotNull(b);
assertToken(JsonToken.END_OBJECT, p.nextToken());
}
}
}

0 comments on commit e66d2fe

Please sign in to comment.