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

8036603: Check jdk/src/windows/native/java/lang/ProcessEnvironment_md.c for JNI pending exceptions

Browse Source 
Added JNI call NULL return checks

Reviewed-by: alanb, mchung
This commit is contained in:
Mark Sheppard 2014-03-20 21:03:43 +00:00
parent c50512a06d
commit 706fe7b1db
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/windows/native/java/lang/ProcessEnvironment_md.c
View File

@ -35,9 +35,13 @@ environmentBlock9x(JNIEnv *env)
jmethodID String_init_ID;
jbyteArray bytes;
jbyte *blockA;
jclass string_class;
string_class = JNU_ClassString(env);
CHECK_NULL_RETURN(string_class, NULL);
String_init_ID =
(*env)->GetMethodID(env, JNU_ClassString(env), "<init>", "([B)V");
(*env)->GetMethodID(env, string_class, "<init>", "([B)V");
CHECK_NULL_RETURN(String_init_ID, NULL);
blockA = (jbyte *) GetEnvironmentStringsA();
@ -54,10 +58,13 @@ environmentBlock9x(JNIEnv *env)
while (blockA[i++])
;
if ((bytes = (*env)->NewByteArray(env, i)) == NULL) return NULL;
if ((bytes = (*env)->NewByteArray(env, i)) == NULL) {
FreeEnvironmentStringsA(blockA);
return NULL;
}
(*env)->SetByteArrayRegion(env, bytes, 0, i, blockA);
FreeEnvironmentStringsA(blockA);
return (*env)->NewObject(env, JNU_ClassString(env),
return (*env)->NewObject(env, string_class,
String_init_ID, bytes);
}