Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
Dragonwell11
提交
d2431837
D
Dragonwell11
项目概览
LinuxSuRen
/
Dragonwell11
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d2431837
编写于
4月 15, 2020
作者:
A
amenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8241522: Manifest improved jar headers redux
Reviewed-by: sspitsyn, jwilhelm, mschoene, rhalade
上级
acb747a3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
14 deletion
+24
-14
src/java.instrument/share/native/libinstrument/EncodingSupport.c
...a.instrument/share/native/libinstrument/EncodingSupport.c
+5
-1
src/java.instrument/share/native/libinstrument/InvocationAdapter.c
...instrument/share/native/libinstrument/InvocationAdapter.c
+19
-13
未找到文件。
src/java.instrument/share/native/libinstrument/EncodingSupport.c
浏览文件 @
d2431837
...
@@ -38,7 +38,11 @@ modifiedUtf8LengthOfUtf8(char* string, int length) {
...
@@ -38,7 +38,11 @@ modifiedUtf8LengthOfUtf8(char* string, int length) {
int
i
;
int
i
;
new_length
=
0
;
new_length
=
0
;
for
(
i
=
0
;
i
<
length
;
i
++
)
{
/*
* if length < 0 or new_length becomes < 0 => string is too big
* (handled as error after the cycle).
*/
for
(
i
=
0
;
i
<
length
&&
new_length
>=
0
;
i
++
)
{
unsigned
byte
;
unsigned
byte
;
byte
=
(
unsigned
char
)
string
[
i
];
byte
=
(
unsigned
char
)
string
[
i
];
...
...
src/java.instrument/share/native/libinstrument/InvocationAdapter.c
浏览文件 @
d2431837
...
@@ -203,8 +203,10 @@ DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) {
...
@@ -203,8 +203,10 @@ DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) {
/*
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* so its length is u2 (i.e. must be <= 0xFFFF).
* so its length is u2 (i.e. must be <= 0xFFFF).
* Negative oldLen or newLen means we got signed integer overflow
* (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative).
*/
*/
if
(
newLen
>
0xFFFF
)
{
if
(
oldLen
<
0
||
newLen
<
0
||
newLen
>
0xFFFF
)
{
fprintf
(
stderr
,
"-javaagent: Premain-Class value is too big
\n
"
);
fprintf
(
stderr
,
"-javaagent: Premain-Class value is too big
\n
"
);
free
(
jarfile
);
free
(
jarfile
);
if
(
options
!=
NULL
)
free
(
options
);
if
(
options
!=
NULL
)
free
(
options
);
...
@@ -372,8 +374,10 @@ DEF_Agent_OnAttach(JavaVM* vm, char *args, void * reserved) {
...
@@ -372,8 +374,10 @@ DEF_Agent_OnAttach(JavaVM* vm, char *args, void * reserved) {
/*
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* so its length is u2 (i.e. must be <= 0xFFFF).
* so its length is u2 (i.e. must be <= 0xFFFF).
* Negative oldLen or newLen means we got signed integer overflow
* (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative).
*/
*/
if
(
newLen
>
0xFFFF
)
{
if
(
oldLen
<
0
||
newLen
<
0
||
newLen
>
0xFFFF
)
{
fprintf
(
stderr
,
"Agent-Class value is too big
\n
"
);
fprintf
(
stderr
,
"Agent-Class value is too big
\n
"
);
free
(
jarfile
);
free
(
jarfile
);
if
(
options
!=
NULL
)
free
(
options
);
if
(
options
!=
NULL
)
free
(
options
);
...
@@ -508,8 +512,10 @@ jint loadAgent(JNIEnv* env, jstring path) {
...
@@ -508,8 +512,10 @@ jint loadAgent(JNIEnv* env, jstring path) {
/*
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* so its length is u2 (i.e. must be <= 0xFFFF).
* so its length is u2 (i.e. must be <= 0xFFFF).
* Negative oldLen or newLen means we got signed integer overflow
* (modifiedUtf8LengthOfUtf8 returns negative value if oldLen is negative).
*/
*/
if
(
newLen
>
0xFFFF
)
{
if
(
oldLen
<
0
||
newLen
<
0
||
newLen
>
0xFFFF
)
{
goto
releaseAndReturn
;
goto
releaseAndReturn
;
}
}
if
(
newLen
==
oldLen
)
{
if
(
newLen
==
oldLen
)
{
...
@@ -554,16 +560,16 @@ jint loadAgent(JNIEnv* env, jstring path) {
...
@@ -554,16 +560,16 @@ jint loadAgent(JNIEnv* env, jstring path) {
// initialization complete
// initialization complete
result
=
JNI_OK
;
result
=
JNI_OK
;
releaseAndReturn:
releaseAndReturn:
if
(
agentClass
!=
NULL
)
{
if
(
agentClass
!=
NULL
)
{
free
(
agentClass
);
free
(
agentClass
);
}
}
if
(
attributes
!=
NULL
)
{
if
(
attributes
!=
NULL
)
{
freeAttributes
(
attributes
);
freeAttributes
(
attributes
);
}
}
if
(
jarfile
!=
NULL
)
{
if
(
jarfile
!=
NULL
)
{
(
*
env
)
->
ReleaseStringUTFChars
(
env
,
path
,
jarfile
);
(
*
env
)
->
ReleaseStringUTFChars
(
env
,
path
,
jarfile
);
}
}
return
result
;
return
result
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录