Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
15432140
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
15432140
编写于
10月 02, 2008
作者:
B
bae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6726779: ConvolveOp on USHORT raster can cause the JVM crash.
Reviewed-by: igor, prr
上级
c49e2e93
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
107 addition
and
26 deletion
+107
-26
src/share/native/sun/awt/medialib/awt_ImagingLib.c
src/share/native/sun/awt/medialib/awt_ImagingLib.c
+12
-26
test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java
test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java
+95
-0
未找到文件。
src/share/native/sun/awt/medialib/awt_ImagingLib.c
浏览文件 @
15432140
...
...
@@ -216,6 +216,16 @@ printMedialibError(int status) {
#endif
/* ! DEBUG */
static
int
getMlibEdgeHint
(
jint
edgeHint
)
{
switch
(
edgeHint
)
{
case
java_awt_image_ConvolveOp_EDGE_NO_OP
:
return
MLIB_EDGE_DST_COPY_SRC
;
case
java_awt_image_ConvolveOp_EDGE_ZERO_FILL
:
default:
return
MLIB_EDGE_DST_FILL_ZERO
;
}
}
/***************************************************************************
* External Functions *
...
...
@@ -400,22 +410,10 @@ Java_sun_awt_image_ImagingLib_convolveBI(JNIEnv *env, jobject this,
}
}
if
(
edgeHint
==
java_awt_image_ConvolveOp_EDGE_NO_OP
)
{
int
kw2
=
kwidth
>>
1
;
int
kh2
=
kheight
>>
1
;
int
bsize
=
mlib_ImageGetChannels
(
src
)
*
(
mlib_ImageGetType
(
src
)
==
MLIB_BYTE
?
1
:
2
);
void
*
dstDataP
=
mlib_ImageGetData
(
dst
);
void
*
srcDataP
=
mlib_ImageGetData
(
src
);
/* REMIND: Copy a smaller area */
memcpy
(
dstDataP
,
srcDataP
,
dst
->
width
*
dst
->
height
*
bsize
);
}
cmask
=
(
1
<<
src
->
channels
)
-
1
;
status
=
(
*
sMlibFns
[
MLIB_CONVMxN
].
fptr
)(
dst
,
src
,
kdata
,
w
,
h
,
(
w
-
1
)
/
2
,
(
h
-
1
)
/
2
,
scale
,
cmask
,
MLIB_EDGE_DST_NO_WRITE
);
getMlibEdgeHint
(
edgeHint
)
);
if
(
status
!=
MLIB_SUCCESS
)
{
printMedialibError
(
status
);
...
...
@@ -660,22 +658,10 @@ Java_sun_awt_image_ImagingLib_convolveRaster(JNIEnv *env, jobject this,
}
}
if
(
edgeHint
==
java_awt_image_ConvolveOp_EDGE_NO_OP
)
{
int
kw2
=
kwidth
>>
1
;
int
kh2
=
kheight
>>
1
;
int
bsize
=
mlib_ImageGetChannels
(
src
)
*
(
mlib_ImageGetType
(
src
)
==
MLIB_BYTE
?
1
:
2
);
void
*
dstDataP
=
mlib_ImageGetData
(
dst
);
void
*
srcDataP
=
mlib_ImageGetData
(
src
);
/* REMIND: Copy a smaller area */
memcpy
(
dstDataP
,
srcDataP
,
dst
->
width
*
dst
->
height
*
bsize
);
}
cmask
=
(
1
<<
src
->
channels
)
-
1
;
status
=
(
*
sMlibFns
[
MLIB_CONVMxN
].
fptr
)(
dst
,
src
,
kdata
,
w
,
h
,
(
w
-
1
)
/
2
,
(
h
-
1
)
/
2
,
scale
,
cmask
,
MLIB_EDGE_DST_NO_WRITE
);
getMlibEdgeHint
(
edgeHint
)
);
if
(
status
!=
MLIB_SUCCESS
)
{
printMedialibError
(
status
);
...
...
test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java
0 → 100644
浏览文件 @
15432140
/*
* Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6726779
* @summary Test verifies that ConvolveOp with the EDGE_NO_OP edge condition
* does not cause JVM crash if size of source raster elements is
* greather than size of the destination raster element.
*
* @run main EdgeNoOpCrash
*/
import
java.awt.Point
;
import
java.awt.image.ConvolveOp
;
import
java.awt.image.DataBuffer
;
import
java.awt.image.ImagingOpException
;
import
java.awt.image.Kernel
;
import
java.awt.image.Raster
;
import
java.awt.image.WritableRaster
;
import
java.util.Arrays
;
public
class
EdgeNoOpCrash
{
private
static
final
int
w
=
3000
;
private
static
final
int
h
=
200
;
public
static
void
main
(
String
[]
args
)
{
crashTest
();
}
private
static
void
crashTest
()
{
Raster
src
=
createSrcRaster
();
WritableRaster
dst
=
createDstRaster
();
ConvolveOp
op
=
createConvolveOp
(
ConvolveOp
.
EDGE_NO_OP
);
try
{
op
.
filter
(
src
,
dst
);
}
catch
(
ImagingOpException
e
)
{
/*
* The test pair of source and destination rasters
* may cause failure of the medialib convolution routine,
* so this exception is expected.
*
* The JVM crash is the only manifestation of this
* test failure.
*/
}
System
.
out
.
println
(
"Test PASSED."
);
}
private
static
Raster
createSrcRaster
()
{
WritableRaster
r
=
Raster
.
createInterleavedRaster
(
DataBuffer
.
TYPE_USHORT
,
w
,
h
,
4
,
new
Point
(
0
,
0
));
return
r
;
}
private
static
WritableRaster
createDstRaster
()
{
WritableRaster
r
=
Raster
.
createInterleavedRaster
(
DataBuffer
.
TYPE_BYTE
,
w
,
h
,
4
,
new
Point
(
0
,
0
));
return
r
;
}
private
static
ConvolveOp
createConvolveOp
(
int
edgeHint
)
{
final
int
kw
=
3
;
final
int
kh
=
3
;
float
[]
kdata
=
new
float
[
kw
*
kh
];
float
v
=
1
f
/
kdata
.
length
;
Arrays
.
fill
(
kdata
,
v
);
Kernel
k
=
new
Kernel
(
kw
,
kh
,
kdata
);
ConvolveOp
op
=
new
ConvolveOp
(
k
,
edgeHint
,
null
);
return
op
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录