mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 14:54:52 +02:00
8222187: java.util.Base64.Decoder stream adds unexpected null bytes at the end
Reviewed-by: lancea, rriggs
This commit is contained in:
Raffaello Giulietti
Lance Andersen
parent
45e17d8dd2
commit
4d43cf9fc6
2 changed files with 165 additions and 91 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -30,7 +30,6 @@ import java.io.InputStream;
|
|||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import sun.nio.cs.ISO_8859_1;
|
||||
|
||||
|
|
@ -961,12 +960,15 @@ public class Base64 {
|
|||
|
||||
private final InputStream is;
|
||||
private final boolean isMIME;
|
||||
private final int[] base64; // base64 -> byte mapping
|
||||
private int bits = 0; // 24-bit buffer for decoding
|
||||
private int nextin = 18; // next available "off" in "bits" for input;
|
||||
// -> 18, 12, 6, 0
|
||||
private int nextout = -8; // next available "off" in "bits" for output;
|
||||
// -> 8, 0, -8 (no byte for output)
|
||||
private final int[] base64; // base64 -> byte mapping
|
||||
private int bits = 0; // 24-bit buffer for decoding
|
||||
|
||||
/* writing bit pos inside bits; one of 24 (left, msb), 18, 12, 6, 0 */
|
||||
private int wpos = 0;
|
||||
|
||||
/* reading bit pos inside bits: one of 24 (left, msb), 16, 8, 0 */
|
||||
private int rpos = 0;
|
||||
|
||||
private boolean eof = false;
|
||||
private boolean closed = false;
|
||||
|
||||
|
|
@ -983,107 +985,153 @@ public class Base64 {
|
|||
return read(sbBuf, 0, 1) == -1 ? -1 : sbBuf[0] & 0xff;
|
||||
}
|
||||
|
||||
private int eof(byte[] b, int off, int len, int oldOff)
|
||||
throws IOException
|
||||
{
|
||||
private int leftovers(byte[] b, int off, int pos, int limit) {
|
||||
eof = true;
|
||||
if (nextin != 18) {
|
||||
if (nextin == 12)
|
||||
throw new IOException("Base64 stream has one un-decoded dangling byte.");
|
||||
// treat ending xx/xxx without padding character legal.
|
||||
// same logic as v == '=' below
|
||||
b[off++] = (byte)(bits >> (16));
|
||||
if (nextin == 0) { // only one padding byte
|
||||
if (len == 1) { // no enough output space
|
||||
bits >>= 8; // shift to lowest byte
|
||||
nextout = 0;
|
||||
} else {
|
||||
b[off++] = (byte) (bits >> 8);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* We use a loop here, as this method is executed only a few times.
|
||||
* Unrolling the loop would probably not contribute much here.
|
||||
*/
|
||||
while (rpos - 8 >= wpos && pos != limit) {
|
||||
rpos -= 8;
|
||||
b[pos++] = (byte) (bits >> rpos);
|
||||
}
|
||||
return off == oldOff ? -1 : off - oldOff;
|
||||
return pos - off != 0 || rpos - 8 >= wpos ? pos - off : -1;
|
||||
}
|
||||
|
||||
private int padding(byte[] b, int off, int len, int oldOff)
|
||||
throws IOException
|
||||
{
|
||||
// = shiftto==18 unnecessary padding
|
||||
// x= shiftto==12 dangling x, invalid unit
|
||||
// xx= shiftto==6 && missing last '='
|
||||
// xx=y or last is not '='
|
||||
if (nextin == 18 || nextin == 12 ||
|
||||
nextin == 6 && is.read() != '=') {
|
||||
throw new IOException("Illegal base64 ending sequence:" + nextin);
|
||||
private int eof(byte[] b, int off, int pos, int limit) throws IOException {
|
||||
/*
|
||||
* pos != limit
|
||||
*
|
||||
* wpos == 18: x dangling single x, invalid unit
|
||||
* accept ending xx or xxx without padding characters
|
||||
*/
|
||||
if (wpos == 18) {
|
||||
throw new IOException("Base64 stream has one un-decoded dangling byte.");
|
||||
}
|
||||
b[off++] = (byte)(bits >> (16));
|
||||
if (nextin == 0) { // only one padding byte
|
||||
if (len == 1) { // no enough output space
|
||||
bits >>= 8; // shift to lowest byte
|
||||
nextout = 0;
|
||||
} else {
|
||||
b[off++] = (byte) (bits >> 8);
|
||||
}
|
||||
rpos = 24;
|
||||
return leftovers(b, off, pos, limit);
|
||||
}
|
||||
|
||||
private int padding(byte[] b, int off, int pos, int limit) throws IOException {
|
||||
/*
|
||||
* pos != limit
|
||||
*
|
||||
* wpos == 24: = (unnecessary padding)
|
||||
* wpos == 18: x= (dangling single x, invalid unit)
|
||||
* wpos == 12 and missing last '=': xx= (invalid padding)
|
||||
* wpos == 12 and last is not '=': xx=x (invalid padding)
|
||||
*/
|
||||
if (wpos >= 18 || wpos == 12 && is.read() != '=') {
|
||||
throw new IOException("Illegal base64 ending sequence:" + wpos);
|
||||
}
|
||||
eof = true;
|
||||
return off - oldOff;
|
||||
rpos = 24;
|
||||
return leftovers(b, off, pos, limit);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int read(byte[] b, int off, int len) throws IOException {
|
||||
if (closed)
|
||||
if (closed) {
|
||||
throw new IOException("Stream is closed");
|
||||
if (eof && nextout < 0) // eof and no leftover
|
||||
return -1;
|
||||
if (off < 0 || len < 0 || len > b.length - off)
|
||||
throw new IndexOutOfBoundsException();
|
||||
int oldOff = off;
|
||||
while (nextout >= 0) { // leftover output byte(s) in bits buf
|
||||
if (len == 0)
|
||||
return off - oldOff;
|
||||
b[off++] = (byte)(bits >> nextout);
|
||||
len--;
|
||||
nextout -= 8;
|
||||
}
|
||||
Objects.checkFromIndexSize(off, len, b.length);
|
||||
if (len == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Rather than keeping 2 running vars (e.g., off and len),
|
||||
* we only keep one (pos), while definitely fixing the boundaries
|
||||
* of the range [off, limit).
|
||||
* More specifically, each use of pos as an index in b meets
|
||||
* pos - off >= 0 & limit - pos > 0
|
||||
*
|
||||
* Note that limit can overflow to Integer.MIN_VALUE. However,
|
||||
* as long as comparisons with pos are as coded, there's no harm.
|
||||
*/
|
||||
int pos = off;
|
||||
final int limit = off + len;
|
||||
if (eof) {
|
||||
return leftovers(b, off, pos, limit);
|
||||
}
|
||||
|
||||
/*
|
||||
* Leftovers from previous invocation; here, wpos = 0.
|
||||
* There can be at most 2 leftover bytes (rpos <= 16).
|
||||
* Further, b has at least one free place.
|
||||
*
|
||||
* The logic could be coded as a loop, (as in method leftovers())
|
||||
* but the explicit "unrolling" makes it possible to generate
|
||||
* better byte extraction code.
|
||||
*/
|
||||
if (rpos == 16) {
|
||||
b[pos++] = (byte) (bits >> 8);
|
||||
rpos = 8;
|
||||
if (pos == limit) {
|
||||
return len;
|
||||
}
|
||||
}
|
||||
if (rpos == 8) {
|
||||
b[pos++] = (byte) bits;
|
||||
rpos = 0;
|
||||
if (pos == limit) {
|
||||
return len;
|
||||
}
|
||||
}
|
||||
|
||||
bits = 0;
|
||||
while (len > 0) {
|
||||
int v = is.read();
|
||||
if (v == -1) {
|
||||
return eof(b, off, len, oldOff);
|
||||
wpos = 24;
|
||||
for (;;) {
|
||||
/* pos != limit & rpos == 0 */
|
||||
final int i = is.read();
|
||||
if (i < 0) {
|
||||
return eof(b, off, pos, limit);
|
||||
}
|
||||
if ((v = base64[v]) < 0) {
|
||||
if (v == -2) { // padding byte(s)
|
||||
return padding(b, off, len, oldOff);
|
||||
}
|
||||
final int v = base64[i];
|
||||
if (v < 0) {
|
||||
/*
|
||||
* i not in alphabet, thus
|
||||
* v == -2: i is '=', the padding
|
||||
* v == -1: i is something else, typically CR or LF
|
||||
*/
|
||||
if (v == -1) {
|
||||
if (!isMIME)
|
||||
throw new IOException("Illegal base64 character " +
|
||||
Integer.toString(v, 16));
|
||||
continue; // skip if for rfc2045
|
||||
if (isMIME) {
|
||||
continue;
|
||||
}
|
||||
throw new IOException("Illegal base64 character 0x" +
|
||||
Integer.toHexString(i));
|
||||
}
|
||||
// neve be here
|
||||
return padding(b, off, pos, limit);
|
||||
}
|
||||
bits |= (v << nextin);
|
||||
if (nextin == 0) {
|
||||
nextin = 18; // clear for next in
|
||||
b[off++] = (byte)(bits >> 16);
|
||||
if (len == 1) {
|
||||
nextout = 8; // 2 bytes left in bits
|
||||
break;
|
||||
}
|
||||
b[off++] = (byte)(bits >> 8);
|
||||
if (len == 2) {
|
||||
nextout = 0; // 1 byte left in bits
|
||||
break;
|
||||
}
|
||||
b[off++] = (byte)bits;
|
||||
len -= 3;
|
||||
wpos -= 6;
|
||||
bits |= v << wpos;
|
||||
if (wpos != 0) {
|
||||
continue;
|
||||
}
|
||||
if (limit - pos >= 3) {
|
||||
/* frequently taken fast path, no need to track rpos */
|
||||
b[pos++] = (byte) (bits >> 16);
|
||||
b[pos++] = (byte) (bits >> 8);
|
||||
b[pos++] = (byte) bits;
|
||||
bits = 0;
|
||||
} else {
|
||||
nextin -= 6;
|
||||
wpos = 24;
|
||||
if (pos == limit) {
|
||||
return len;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
/* b has either 1 or 2 free places */
|
||||
b[pos++] = (byte) (bits >> 16);
|
||||
if (pos == limit) {
|
||||
rpos = 16;
|
||||
return len;
|
||||
}
|
||||
b[pos++] = (byte) (bits >> 8);
|
||||
/* pos == limit, no need for an if */
|
||||
rpos = 8;
|
||||
return len;
|
||||
}
|
||||
return off - oldOff;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue