Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
754c3f3b
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
754c3f3b
编写于
4月 30, 2013
作者:
M
msheppar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8007799: Base64.getEncoder(0, byte[]) returns an encoder that unexpectedly inserts line separators
Reviewed-by: sherman, iris
上级
f1f76ba4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
165 addition
and
1 deletion
+165
-1
src/share/classes/java/util/Base64.java
src/share/classes/java/util/Base64.java
+4
-1
test/java/util/Base64/Base64GetEncoderTest.java
test/java/util/Base64/Base64GetEncoderTest.java
+161
-0
未找到文件。
src/share/classes/java/util/Base64.java
浏览文件 @
754c3f3b
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012,
2013
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
...
...
@@ -139,6 +139,9 @@ public class Base64 {
throw
new
IllegalArgumentException
(
"Illegal base64 line separator character 0x"
+
Integer
.
toString
(
b
,
16
));
}
if
(
lineLength
<=
0
)
{
return
Encoder
.
RFC4648
;
}
return
new
Encoder
(
false
,
lineSeparator
,
lineLength
>>
2
<<
2
);
}
...
...
test/java/util/Base64/Base64GetEncoderTest.java
0 → 100644
浏览文件 @
754c3f3b
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.nio.ByteBuffer
;
import
java.util.Base64
;
import
static
java
.
nio
.
charset
.
StandardCharsets
.
US_ASCII
;
/**
* @test
* @bug 8007799
* @summary test Encoder with linemax == 0, line separator should not appear in encoded data
*/
public
class
Base64GetEncoderTest
{
public
static
void
main
(
String
args
[])
throws
Throwable
{
final
Base64
.
Encoder
encoder
=
Base64
.
getEncoder
(
0
,
"$$$"
.
getBytes
(
US_ASCII
));
testEncodeToString
(
encoder
);
testWrapEncode1
(
encoder
);
testEncodeToStringWithLongInputData
(
encoder
);
testWrapEncode2
(
encoder
);
testEncodeWithByteBuffer
(
encoder
);
}
private
static
void
testEncodeWithByteBuffer
(
final
Base64
.
Encoder
encoder
)
{
System
.
err
.
println
(
"\n\nEncoder.encode with ByteBuffer test "
);
final
byte
[]
secondTestBuffer
=
"api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
.
getBytes
(
US_ASCII
);
String
base64EncodedString
;
ByteBuffer
srcData
=
ByteBuffer
.
wrap
(
secondTestBuffer
);
ByteBuffer
dstData
=
ByteBuffer
.
allocate
(
secondTestBuffer
.
length
*
2
);
encoder
.
encode
(
srcData
,
dstData
,
0
);
dstData
.
flip
();
if
(
dstData
.
hasArray
())
{
System
.
err
.
println
(
"\nByteBuffer test dstData is Base64 encoding = "
+
new
String
(
dstData
.
array
(),
US_ASCII
)
+
"\n"
);
}
base64EncodedString
=
new
String
(
dstData
.
array
(),
US_ASCII
);
if
(
base64EncodedString
.
contains
(
"$$$"
))
{
throw
new
RuntimeException
(
"Base64 encoding contains line separator after Encoder.encode ByteBuffer ... \n"
);
}
}
private
static
void
testWrapEncode2
(
final
Base64
.
Encoder
encoder
)
throws
IOException
{
System
.
err
.
println
(
"\nEncoder.wrap test II "
);
final
byte
[]
secondTestBuffer
=
"api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
.
getBytes
(
US_ASCII
);
String
base64EncodedString
;
ByteArrayOutputStream
secondEncodingStream
=
new
ByteArrayOutputStream
();
OutputStream
base64EncodingStream
=
encoder
.
wrap
(
secondEncodingStream
);
base64EncodingStream
.
write
(
secondTestBuffer
);
base64EncodingStream
.
close
();
final
byte
[]
encodedByteArray
=
secondEncodingStream
.
toByteArray
();
System
.
err
.
print
(
"result = "
+
new
String
(
encodedByteArray
,
US_ASCII
)
+
" after wrap Base64 encoding of string"
);
base64EncodedString
=
new
String
(
encodedByteArray
,
US_ASCII
);
if
(
base64EncodedString
.
contains
(
"$$$"
))
{
throw
new
RuntimeException
(
"Base64 encoding contains line separator after wrap 2 invoked ... \n"
);
}
}
private
static
void
testEncodeToStringWithLongInputData
(
final
Base64
.
Encoder
encoder
)
{
System
.
err
.
println
(
"\n\nEncoder.encodeToStringWithLongInputData test "
);
final
byte
[]
secondTestBuffer
=
"api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
.
getBytes
(
US_ASCII
);
String
base64EncodedString
;
base64EncodedString
=
encoder
.
encodeToString
(
secondTestBuffer
);
System
.
err
.
println
(
"Second Base64 encoded string is "
+
base64EncodedString
);
if
(
base64EncodedString
.
contains
(
"$$$"
))
{
throw
new
RuntimeException
(
"Base64 encoding contains line separator after encodeToString invoked ... \n"
);
}
}
private
static
void
testWrapEncode1
(
final
Base64
.
Encoder
encoder
)
throws
IOException
{
System
.
err
.
println
(
"\nEncoder.wrap test I "
);
final
byte
[]
bytesIn
=
"fo"
.
getBytes
(
US_ASCII
);
String
base64EncodedString
;
ByteArrayOutputStream
encodingStream
=
new
ByteArrayOutputStream
();
OutputStream
encoding
=
encoder
.
wrap
(
encodingStream
);
encoding
.
write
(
bytesIn
);
encoding
.
close
();
final
byte
[]
encodedBytes
=
encodingStream
.
toByteArray
();
System
.
err
.
print
(
"result = "
+
new
String
(
encodedBytes
,
US_ASCII
)
+
" after the Base64 encoding \n"
);
base64EncodedString
=
new
String
(
encodedBytes
,
US_ASCII
);
if
(
base64EncodedString
.
contains
(
"$$$"
))
{
throw
new
RuntimeException
(
"Base64 encoding contains line separator after wrap I test ... \n"
);
}
}
private
static
void
testEncodeToString
(
final
Base64
.
Encoder
encoder
)
{
final
byte
[]
bytesIn
=
"fo"
.
getBytes
(
US_ASCII
);
System
.
err
.
println
(
"\nEncoder.encodeToString test "
);
String
base64EncodedString
=
encoder
.
encodeToString
(
bytesIn
);
System
.
err
.
println
(
"Base64 encoded string is "
+
base64EncodedString
);
if
(
base64EncodedString
.
contains
(
"$$$"
))
{
throw
new
RuntimeException
(
"Base64 encoding contains line separator after Encoder.encodeToString invoked ... \n"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录