提交 fa8b6bfe 编写于 作者: S sherman

8007298: Base64.getMimeDecoder().decode() throws IAE for a single non-base64 character

8006526: Base64.Decoder.decode(String) spec contains a copy-paste mistake
Summary: to ignore single non-base64 char in mime decoding
Reviewed-by: alanb
上级 3da964d6
......@@ -696,7 +696,7 @@ public class Base64 {
* using the {@link Base64} encoding scheme.
*
* <p> An invocation of this method has exactly the same effect as invoking
* {@code return decode(src.getBytes(StandardCharsets.ISO_8859_1))}
* {@code decode(src.getBytes(StandardCharsets.ISO_8859_1))}
*
* @param src
* the string to decode
......@@ -1014,9 +1014,12 @@ public class Base64 {
int len = sl - sp;
if (len == 0)
return 0;
if (len < 2)
if (len < 2) {
if (isMIME && base64[0] == -1)
return 0;
throw new IllegalArgumentException(
"Input byte[] should at least have 2 bytes for base64 bytes");
}
if (src[sl - 1] == '=') {
paddings++;
if (src[sl - 2] == '=')
......
......@@ -22,7 +22,7 @@
*/
/**
* @test 4235519 8004212 8005394
* @test 4235519 8004212 8005394 8007298
* @summary tests java.util.Base64
*/
......@@ -109,6 +109,9 @@ public class TestBase64 {
// test return value from decode(ByteBuffer, ByteBuffer)
testDecBufRet();
// test single-non-base64 character for mime decoding
testSingleNonBase64MimeDec();
}
private static sun.misc.BASE64Encoder sunmisc = new sun.misc.BASE64Encoder();
......@@ -356,6 +359,19 @@ public class TestBase64 {
} catch (IllegalArgumentException iae) {}
}
// single-non-base64-char should be ignored for mime decoding, but
// iae for basic decoding
private static void testSingleNonBase64MimeDec() throws Throwable {
for (String nonBase64 : new String[] {"#", "(", "!", "\\", "-", "_"}) {
if (Base64.getMimeDecoder().decode(nonBase64).length != 0) {
throw new RuntimeException("non-base64 char is not ignored");
}
try {
Base64.getDecoder().decode(nonBase64);
throw new RuntimeException("No IAE for single non-base64 char");
} catch (IllegalArgumentException iae) {}
}
}
private static void testDecBufRet() throws Throwable {
Random rnd = new java.util.Random();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册