Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
f084b632
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f084b632
编写于
8月 19, 2019
作者:
J
Jonathan Bluett-Duncan
提交者:
Rossen Stoyanchev
9月 03, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix "array index out of bounds" problem reported by LGTM.com
上级
670cbb9a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
6 deletion
+32
-6
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
...ain/java/org/springframework/http/ContentDisposition.java
+13
-5
spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
...ava/org/springframework/http/ContentDispositionTests.java
+19
-1
未找到文件。
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
浏览文件 @
f084b632
...
...
@@ -42,6 +42,9 @@ import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
*/
public
final
class
ContentDisposition
{
private
static
final
String
INVALID_HEADER_FIELD_PARAMETER_FORMAT
=
"Invalid header field parameter format (as defined in RFC 5987)"
;
@Nullable
private
final
String
type
;
...
...
@@ -357,7 +360,7 @@ public final class ContentDisposition {
}
/**
* Decode the given header field param as describe in RFC 5987.
* Decode the given header field param as describe
d
in RFC 5987.
* <p>Only the US-ASCII, UTF-8 and ISO-8859-1 charsets are supported.
* @param input the header field param
* @return the encoded header field param
...
...
@@ -383,13 +386,18 @@ public final class ContentDisposition {
bos
.
write
((
char
)
b
);
index
++;
}
else
if
(
b
==
'%'
)
{
char
[]
array
=
{
(
char
)
value
[
index
+
1
],
(
char
)
value
[
index
+
2
]};
bos
.
write
(
Integer
.
parseInt
(
String
.
valueOf
(
array
),
16
));
else
if
(
b
==
'%'
&&
index
<
value
.
length
-
2
)
{
char
[]
array
=
new
char
[]{(
char
)
value
[
index
+
1
],
(
char
)
value
[
index
+
2
]};
try
{
bos
.
write
(
Integer
.
parseInt
(
String
.
valueOf
(
array
),
16
));
}
catch
(
NumberFormatException
ex
)
{
throw
new
IllegalArgumentException
(
INVALID_HEADER_FIELD_PARAMETER_FORMAT
,
ex
);
}
index
+=
3
;
}
else
{
throw
new
IllegalArgumentException
(
"Invalid header field parameter format (as defined in RFC 5987)"
);
throw
new
IllegalArgumentException
(
INVALID_HEADER_FIELD_PARAMETER_FORMAT
);
}
}
return
new
String
(
bos
.
toByteArray
(),
charset
);
...
...
spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
浏览文件 @
f084b632
...
...
@@ -28,6 +28,7 @@ import org.springframework.util.ReflectionUtils;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThatIllegalArgumentException
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThatThrownBy
;
/**
* Unit tests for {@link ContentDisposition}
...
...
@@ -36,7 +37,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
*/
public
class
ContentDispositionTests
{
@Test
public
void
parseTest
()
{
ContentDisposition
disposition
=
ContentDisposition
...
...
@@ -198,4 +198,22 @@ public class ContentDispositionTests {
ReflectionUtils
.
invokeMethod
(
decode
,
null
,
"UTF-16''test"
));
}
@Test
public
void
decodeHeaderFieldParamShortInvalidEncodedFilename
()
{
Method
decode
=
ReflectionUtils
.
findMethod
(
ContentDisposition
.
class
,
"decodeHeaderFieldParam"
,
String
.
class
);
ReflectionUtils
.
makeAccessible
(
decode
);
assertThatIllegalArgumentException
().
isThrownBy
(()
->
ReflectionUtils
.
invokeMethod
(
decode
,
null
,
"UTF-8''%A"
));
}
@Test
public
void
decodeHeaderFieldParamLongerInvalidEncodedFilename
()
{
Method
decode
=
ReflectionUtils
.
findMethod
(
ContentDisposition
.
class
,
"decodeHeaderFieldParam"
,
String
.
class
);
ReflectionUtils
.
makeAccessible
(
decode
);
assertThatIllegalArgumentException
().
isThrownBy
(()
->
ReflectionUtils
.
invokeMethod
(
decode
,
null
,
"UTF-8''%A.txt"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录