Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
747082a6
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看板
提交
747082a6
编写于
4月 24, 2018
作者:
A
aivanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8201433: Fix potential crash in BufImg_SetupICM
Reviewed-by: prr, serb
上级
f6a27849
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
89 addition
and
0 deletion
+89
-0
src/share/native/sun/awt/image/BufImgSurfaceData.c
src/share/native/sun/awt/image/BufImgSurfaceData.c
+4
-0
test/java/awt/image/BufferedImage/ICMColorDataTest/ICMColorDataTest.java
...mage/BufferedImage/ICMColorDataTest/ICMColorDataTest.java
+85
-0
未找到文件。
src/share/native/sun/awt/image/BufImgSurfaceData.c
浏览文件 @
747082a6
...
...
@@ -298,6 +298,10 @@ static ColorData *BufImg_SetupICM(JNIEnv *env,
}
cData
->
img_clr_tbl
=
initCubemap
(
pRgb
,
bisdo
->
lutsize
,
32
);
if
(
cData
->
img_clr_tbl
==
NULL
)
{
free
(
cData
);
return
(
ColorData
*
)
NULL
;
}
if
(
allGray
==
JNI_TRUE
)
{
initInverseGrayLut
(
pRgb
,
bisdo
->
lutsize
,
cData
);
}
...
...
test/java/awt/image/BufferedImage/ICMColorDataTest/ICMColorDataTest.java
0 → 100644
浏览文件 @
747082a6
/*
* Copyright (c) 2018, 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.awt.Graphics
;
import
java.awt.image.BufferedImage
;
import
java.awt.image.DataBuffer
;
import
java.awt.image.DataBufferByte
;
import
java.awt.image.IndexColorModel
;
import
java.awt.image.MultiPixelPackedSampleModel
;
import
java.awt.image.Raster
;
import
java.awt.image.SampleModel
;
import
java.awt.image.WritableRaster
;
/*
* @test
* @bug 8201433
* @summary This test may throw OOME or NPE from native code,
* it should not crash
* @requires os.maxMemory >= 2G
* @run main/othervm/timeout=300000 -Xms1000m -Xmx1000m ICMColorDataTest
*/
public
class
ICMColorDataTest
{
private
static
final
int
WIDTH
=
90
;
private
static
final
int
HEIGHT
=
90
;
private
static
final
int
BITS_PER_PIXEL
=
1
;
private
static
final
int
PIXELS_IN_BYTE
=
8
;
// Color model components
private
static
final
byte
[]
RED
=
{
(
byte
)
255
,
0
};
private
static
final
byte
[]
GREEN
=
{
(
byte
)
255
,
0
};
private
static
final
byte
[]
BLUE
=
{
(
byte
)
255
,
0
};
public
static
void
main
(
String
[]
args
)
{
try
{
for
(
long
i
=
0
;
i
<
300_000
;
i
++)
{
makeImage
();
}
}
catch
(
OutOfMemoryError
|
NullPointerException
e
)
{
System
.
err
.
println
(
"Caught expected exception:\n"
+
e
.
getClass
()
+
": "
+
e
.
getMessage
());
}
System
.
err
.
println
(
"Test passed"
);
}
private
static
void
makeImage
()
{
int
scanLineBytes
=
WIDTH
/
PIXELS_IN_BYTE
;
if
((
WIDTH
&
(
PIXELS_IN_BYTE
-
1
))
!=
0
)
{
// Make sure all the pixels in a scan line fit
scanLineBytes
+=
1
;
}
byte
[]
bits
=
new
byte
[
scanLineBytes
*
HEIGHT
];
DataBuffer
dataBuf
=
new
DataBufferByte
(
bits
,
bits
.
length
,
0
);
SampleModel
sampleModel
=
new
MultiPixelPackedSampleModel
(
DataBuffer
.
TYPE_BYTE
,
WIDTH
,
HEIGHT
,
BITS_PER_PIXEL
);
WritableRaster
raster
=
Raster
.
createWritableRaster
(
sampleModel
,
dataBuf
,
null
);
IndexColorModel
indexModel
=
new
IndexColorModel
(
2
,
2
,
RED
,
GREEN
,
BLUE
);
BufferedImage
bufImage
=
new
BufferedImage
(
indexModel
,
raster
,
indexModel
.
isAlphaPremultiplied
(),
null
);
Graphics
g
=
bufImage
.
getGraphics
();
g
.
drawRect
(
0
,
0
,
WIDTH
-
1
,
HEIGHT
-
1
);
g
.
dispose
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录