Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6b6696ca
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b6696ca
编写于
6月 25, 2014
作者:
M
mduigou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8047795: Collections.checkedList checking bypassed by List.replaceAll
Reviewed-by: psandoz, chegar
上级
2bcd9f7c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
120 addition
and
7 deletion
+120
-7
src/share/classes/java/util/Collections.java
src/share/classes/java/util/Collections.java
+16
-7
test/java/util/Collections/CheckedListReplaceAll.java
test/java/util/Collections/CheckedListReplaceAll.java
+50
-0
test/java/util/Collections/CheckedMapReplaceAll.java
test/java/util/Collections/CheckedMapReplaceAll.java
+54
-0
未找到文件。
src/share/classes/java/util/Collections.java
浏览文件 @
6b6696ca
...
...
@@ -3031,9 +3031,11 @@ public class Collections {
final
Collection
<
E
>
c
;
final
Class
<
E
>
type
;
void
typeCheck
(
Object
o
)
{
@SuppressWarnings
(
"unchecked"
)
E
typeCheck
(
Object
o
)
{
if
(
o
!=
null
&&
!
type
.
isInstance
(
o
))
throw
new
ClassCastException
(
badElementMsg
(
o
));
return
(
E
)
o
;
}
private
String
badElementMsg
(
Object
o
)
{
...
...
@@ -3042,10 +3044,8 @@ public class Collections {
}
CheckedCollection
(
Collection
<
E
>
c
,
Class
<
E
>
type
)
{
if
(
c
==
null
||
type
==
null
)
throw
new
NullPointerException
();
this
.
c
=
c
;
this
.
type
=
type
;
this
.
c
=
Objects
.
requireNonNull
(
c
,
"c"
);
this
.
type
=
Objects
.
requireNonNull
(
type
,
"type"
);
}
public
int
size
()
{
return
c
.
size
();
}
...
...
@@ -3091,7 +3091,7 @@ public class Collections {
@SuppressWarnings
(
"unchecked"
)
Collection
<
E
>
checkedCopyOf
(
Collection
<?
extends
E
>
coll
)
{
Object
[]
a
=
null
;
Object
[]
a
;
try
{
E
[]
z
=
zeroLengthElementArray
();
a
=
coll
.
toArray
(
z
);
...
...
@@ -3487,10 +3487,19 @@ public class Collections {
return
new
CheckedList
<>(
list
.
subList
(
fromIndex
,
toIndex
),
type
);
}
/**
* {@inheritDoc}
*
* @throws ClassCastException if the class of an element returned by the
* operator prevents it from being added to this collection. The
* exception may be thrown after some elements of the list have
* already been replaced.
*/
@Override
public
void
replaceAll
(
UnaryOperator
<
E
>
operator
)
{
list
.
replaceAll
(
operator
);
list
.
replaceAll
(
e
->
typeCheck
(
operator
.
apply
(
e
))
);
}
@Override
public
void
sort
(
Comparator
<?
super
E
>
c
)
{
list
.
sort
(
c
);
...
...
test/java/util/Collections/CheckedListReplaceAll.java
0 → 100644
浏览文件 @
6b6696ca
/*
* Copyright (c) 2014, 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.
*/
/*
* @test
* @bug 8047795
* @summary Ensure that replaceAll operator cannot add bad elements
* @author Mike Duigou
*/
import
java.util.*
;
import
java.util.function.UnaryOperator
;
public
class
CheckedListReplaceAll
{
public
static
void
main
(
String
[]
args
)
{
List
unwrapped
=
Arrays
.
asList
(
new
Object
[]{
1
,
2
,
3
});
List
<
Object
>
wrapped
=
Collections
.
checkedList
(
unwrapped
,
Integer
.
class
);
UnaryOperator
evil
=
e
->
(((
int
)
e
)
%
2
!=
0
)
?
e
:
"evil"
;
try
{
wrapped
.
replaceAll
(
evil
);
System
.
out
.
printf
(
"Bwahaha! I have defeated you! %s\n"
,
wrapped
);
throw
new
RuntimeException
(
"String added to checked List<Integer>"
);
}
catch
(
ClassCastException
thwarted
)
{
thwarted
.
printStackTrace
(
System
.
out
);
System
.
out
.
println
(
"Curses! Foiled again!"
);
}
}
}
test/java/util/Collections/CheckedMapReplaceAll.java
0 → 100644
浏览文件 @
6b6696ca
/*
* Copyright (c) 2014, 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.
*/
/*
* @test
* @bug 8047795
* @summary Ensure that replaceAll operator cannot add bad elements
* @author Mike Duigou
*/
import
java.util.*
;
import
java.util.function.BiFunction
;
public
class
CheckedMapReplaceAll
{
public
static
void
main
(
String
[]
args
)
{
Map
<
Integer
,
Double
>
unwrapped
=
new
HashMap
<>();
unwrapped
.
put
(
1
,
1.0
);
unwrapped
.
put
(
2
,
2.0
);
unwrapped
.
put
(
3
,
3.0
);
Map
<
Integer
,
Double
>
wrapped
=
Collections
.
checkedMap
(
unwrapped
,
Integer
.
class
,
Double
.
class
);
BiFunction
evil
=
(
k
,
v
)
->
(((
int
)
k
)
%
2
!=
0
)
?
v
:
"evil"
;
try
{
wrapped
.
replaceAll
(
evil
);
System
.
out
.
printf
(
"Bwahaha! I have defeated you! %s\n"
,
wrapped
);
throw
new
RuntimeException
(
"String added to checked Map<Integer,Double>"
);
}
catch
(
ClassCastException
thwarted
)
{
thwarted
.
printStackTrace
(
System
.
out
);
System
.
out
.
println
(
"Curses! Foiled again!"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录