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

8145015: jni_GetStringCritical asserts for empty strings

Browse Source 
Reviewed-by: thartmann, dholmes
This commit is contained in:
Volker Simonis 2015-12-15 00:16:09 -05:00
parent 7ef8e1953d
commit 9fc9cf684a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hotspot/src/share/vm/prims/jni.cpp
View File

@ -3194,17 +3194,20 @@ JNI_ENTRY(const jchar*, jni_GetStringCritical(JNIEnv *env, jstring string, jbool
if (isCopy != NULL) { if (isCopy != NULL) {
*isCopy = is_latin1 ? JNI_TRUE : JNI_FALSE; *isCopy = is_latin1 ? JNI_TRUE : JNI_FALSE;
} }
const jchar* ret; jchar* ret;
if (!is_latin1) { if (!is_latin1) {
ret = s_value->char_at_addr(0); ret = (jchar*) s_value->base(T_CHAR);
} else { } else {
// Inflate latin1 encoded string to UTF16 // Inflate latin1 encoded string to UTF16
int s_len = java_lang_String::length(s); int s_len = java_lang_String::length(s);
jchar* buf = NEW_C_HEAP_ARRAY(jchar, s_len, mtInternal); ret = NEW_C_HEAP_ARRAY_RETURN_NULL(jchar, s_len + 1, mtInternal); // add one for zero termination
for (int i = 0; i < s_len; i++) { /* JNI Specification states return NULL on OOM */
buf[i] = ((jchar) s_value->byte_at(i)) & 0xff; if (ret != NULL) {
for (int i = 0; i < s_len; i++) {
ret[i] = ((jchar) s_value->byte_at(i)) & 0xff;
}
ret[s_len] = 0;
} }
ret = &buf[0];
} }
HOTSPOT_JNI_GETSTRINGCRITICAL_RETURN((uint16_t *) ret); HOTSPOT_JNI_GETSTRINGCRITICAL_RETURN((uint16_t *) ret);
return ret; return ret;