Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jdk17u
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
openjdk
jdk17u
Commits
fb7bb62c
Commit
fb7bb62c
authored
Jul 26, 2024
by
john spurling
Committed by
Aleksey Shipilev
Jul 26, 2024
Browse files
Options
Downloads
Patches
Plain Diff
8310628: GcInfoBuilder.c missing JNI Exception checks
Backport-of: a9c0a0f6b915f9ddaa97d83bad4f3c2b38810636
parent
666e4890
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c
+29
-9
29 additions, 9 deletions
...management/share/native/libmanagement_ext/GcInfoBuilder.c
with
29 additions
and
9 deletions
src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c
+
29
−
9
View file @
fb7bb62c
/*
/*
* Copyright (c) 2003, 202
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 202
3
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -129,7 +129,9 @@ static void setLongValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -129,7 +129,9 @@ static void setLongValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Long"
;
static
const
char
*
class_name
=
"java/lang/Long"
;
static
const
char
*
signature
=
"(J)V"
;
static
const
char
*
signature
=
"(J)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -138,7 +140,9 @@ static void setBooleanValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -138,7 +140,9 @@ static void setBooleanValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Boolean"
;
static
const
char
*
class_name
=
"java/lang/Boolean"
;
static
const
char
*
signature
=
"(Z)V"
;
static
const
char
*
signature
=
"(Z)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -147,7 +151,9 @@ static void setByteValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -147,7 +151,9 @@ static void setByteValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Byte"
;
static
const
char
*
class_name
=
"java/lang/Byte"
;
static
const
char
*
signature
=
"(B)V"
;
static
const
char
*
signature
=
"(B)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -156,7 +162,9 @@ static void setIntValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -156,7 +162,9 @@ static void setIntValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Integer"
;
static
const
char
*
class_name
=
"java/lang/Integer"
;
static
const
char
*
signature
=
"(I)V"
;
static
const
char
*
signature
=
"(I)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -165,7 +173,9 @@ static void setShortValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -165,7 +173,9 @@ static void setShortValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Short"
;
static
const
char
*
class_name
=
"java/lang/Short"
;
static
const
char
*
signature
=
"(S)V"
;
static
const
char
*
signature
=
"(S)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -174,7 +184,9 @@ static void setDoubleValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -174,7 +184,9 @@ static void setDoubleValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Double"
;
static
const
char
*
class_name
=
"java/lang/Double"
;
static
const
char
*
signature
=
"(D)V"
;
static
const
char
*
signature
=
"(D)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -183,7 +195,9 @@ static void setFloatValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -183,7 +195,9 @@ static void setFloatValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Float"
;
static
const
char
*
class_name
=
"java/lang/Float"
;
static
const
char
*
signature
=
"(D)V"
;
static
const
char
*
signature
=
"(D)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -192,7 +206,9 @@ static void setCharValueAtObjectArray(JNIEnv *env, jobjectArray array,
...
@@ -192,7 +206,9 @@ static void setCharValueAtObjectArray(JNIEnv *env, jobjectArray array,
static
const
char
*
class_name
=
"java/lang/Character"
;
static
const
char
*
class_name
=
"java/lang/Character"
;
static
const
char
*
signature
=
"(C)V"
;
static
const
char
*
signature
=
"(C)V"
;
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
jobject
obj
=
JNU_NewObjectByName
(
env
,
class_name
,
signature
,
value
);
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
;
}
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
(
*
env
)
->
SetObjectArrayElement
(
env
,
array
,
index
,
obj
);
}
}
...
@@ -293,6 +309,10 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast
...
@@ -293,6 +309,10 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast
if
(
nativeTypes
!=
NULL
)
{
if
(
nativeTypes
!=
NULL
)
{
free
(
nativeTypes
);
free
(
nativeTypes
);
}
}
// Recognise possible Exception from the switch statement above:
if
((
*
env
)
->
ExceptionCheck
(
env
))
{
return
NULL
;
}
return
JNU_NewObjectByName
(
env
,
return
JNU_NewObjectByName
(
env
,
"com/sun/management/GcInfo"
,
"com/sun/management/GcInfo"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment