Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3df95fba
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看板
提交
3df95fba
编写于
3月 23, 2015
作者:
B
bae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8074954: ImageInputStreamImpl.readShort/readInt do not behave correctly at EOF
Reviewed-by: prr, serb
上级
ed36abb8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
129 addition
and
2 deletion
+129
-2
src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
...re/classes/javax/imageio/stream/ImageInputStreamImpl.java
+2
-2
test/javax/imageio/stream/ShortStreamTest.java
test/javax/imageio/stream/ShortStreamTest.java
+127
-0
未找到文件。
src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
浏览文件 @
3df95fba
...
...
@@ -225,7 +225,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
}
public
short
readShort
()
throws
IOException
{
if
(
read
(
byteBuf
,
0
,
2
)
<
0
)
{
if
(
read
(
byteBuf
,
0
,
2
)
!=
2
)
{
throw
new
EOFException
();
}
...
...
@@ -247,7 +247,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream {
}
public
int
readInt
()
throws
IOException
{
if
(
read
(
byteBuf
,
0
,
4
)
<
0
)
{
if
(
read
(
byteBuf
,
0
,
4
)
!=
4
)
{
throw
new
EOFException
();
}
...
...
test/javax/imageio/stream/ShortStreamTest.java
0 → 100644
浏览文件 @
3df95fba
/*
* Copyright (c) 2015, 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 8074954
* @summary Test verifies that an IOException is triggered if input stream
* does not contain enough data to read a multi-byte type.
*
* @run main ShortStreamTest
*/
import
javax.imageio.ImageIO
;
import
javax.imageio.stream.ImageInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.io.IOException
;
public
class
ShortStreamTest
{
public
static
void
main
(
String
[]
args
)
throws
IOException
{
TestCase
[]
tests
=
createTests
();
for
(
TestCase
t
:
tests
)
{
t
.
test
();
}
}
private
static
abstract
class
TestCase
{
abstract
void
testRead
(
ImageInputStream
iis
)
throws
IOException
;
public
void
test
()
{
boolean
gotException
=
false
;
ImageInputStream
iis
=
createShortStream
();
try
{
testRead
(
iis
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
System
.
out
);
gotException
=
true
;
}
if
(!
gotException
)
{
throw
new
RuntimeException
(
"Test failed."
);
}
System
.
out
.
println
(
"Test PASSED"
);
}
}
private
static
ImageInputStream
createShortStream
()
{
try
{
byte
[]
integerTestArray
=
new
byte
[]
{
80
};
ByteArrayInputStream
bais
=
new
ByteArrayInputStream
(
integerTestArray
);
return
ImageIO
.
createImageInputStream
(
bais
);
}
catch
(
IOException
e
)
{
return
null
;
}
}
private
static
TestCase
[]
createTests
()
{
return
new
TestCase
[]{
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readInt
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readShort
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readDouble
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readFloat
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readLong
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readUnsignedInt
();
}
},
new
TestCase
()
{
@Override
void
testRead
(
ImageInputStream
iis
)
throws
IOException
{
iis
.
readUnsignedShort
();
}
}
};
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录