archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8308748: JNU_GetStringPlatformChars may write to String's internal memory array

Browse source 
Reviewed-by: dholmes, rriggs, alanb
This commit is contained in:
Rudi Horn 2023-06-06 12:58:24 +00:00 • committed by Alan Bateman
parent 01455a07a7
commit 8f0839bc55
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/java.base/share/native/libjava/jni_util.c
View file

@ -915,7 +915,7 @@ getStringUTF8(JNIEnv *env, jstring jstr, jboolean strict)
// we need two bytes for each latin-1 char above 127 (negative jbytes)
for (i = 0; i < len; i++) {
if (strict && str[i] == 0) {
(*env)->ReleasePrimitiveArrayCritical(env, value, str, 0);
(*env)->ReleasePrimitiveArrayCritical(env, value, str, JNI_ABORT);
JNU_ThrowIllegalArgumentException(env, "NUL character not allowed in platform string");
return NULL;
}
@ -926,7 +926,7 @@ getStringUTF8(JNIEnv *env, jstring jstr, jboolean strict)
result = MALLOC_MIN4(rlen);
if (result == NULL) {
(*env)->ReleasePrimitiveArrayCritical(env, value, str, 0);
(*env)->ReleasePrimitiveArrayCritical(env, value, str, JNI_ABORT);
JNU_ThrowOutOfMemoryError(env, "requested array size exceeds VM limit");
return NULL;
}
@ -940,7 +940,7 @@ getStringUTF8(JNIEnv *env, jstring jstr, jboolean strict)
result[ri++] = c;
}
}
(*env)->ReleasePrimitiveArrayCritical(env, value, str, 0);
(*env)->ReleasePrimitiveArrayCritical(env, value, str, JNI_ABORT);
result[rlen] = '\0';
return result;
}