stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8241522: Manifest improved jar headers redux

Browse Source 
Reviewed-by: sspitsyn, jwilhelm, mschoene, rhalade
This commit is contained in:
Alex Menkov 2020-04-14 14:21:25 -07:00
parent d7bbb5c4a6
commit 19c29923a5
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.instrument/share/native/libinstrument/EncodingSupport.c
View File

@ -38,7 +38,11 @@ modifiedUtf8LengthOfUtf8(char* string, int length) {
int i;
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;
byte = (unsigned char)string[i];

32
src/java.instrument/share/native/libinstrument/InvocationAdapter.c
View File

@ -205,8 +205,10 @@ DEF_Agent_OnLoad(JavaVM *vm, char *tail, void * reserved) {
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* 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");
free(jarfile);
if (options != NULL) free(options);
@ -374,8 +376,10 @@ DEF_Agent_OnAttach(JavaVM* vm, char *args, void * reserved) {
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* 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");
free(jarfile);
if (options != NULL) free(options);
@ -510,8 +514,10 @@ jint loadAgent(JNIEnv* env, jstring path) {
/*
* According to JVMS class name is represented as CONSTANT_Utf8_info,
* 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;
}
if (newLen == oldLen) {
@ -556,16 +562,16 @@ jint loadAgent(JNIEnv* env, jstring path) {
// initialization complete
result = JNI_OK;
releaseAndReturn:
if (agentClass != NULL) {
free(agentClass);
}
if (attributes != NULL) {
freeAttributes(attributes);
}
if (jarfile != NULL) {
(*env)->ReleaseStringUTFChars(env, path, jarfile);
}
releaseAndReturn:
if (agentClass != NULL) {
free(agentClass);
}
if (attributes != NULL) {
freeAttributes(attributes);
}
if (jarfile != NULL) {
(*env)->ReleaseStringUTFChars(env, path, jarfile);
}
return result;
}