--- old/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c 2018-10-08 00:45:47.853973759 +0900 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c 2018-10-08 00:45:47.453961079 +0900 @@ -113,6 +113,7 @@ { #ifndef HEADLESS int len; + jsize jlen; char *filename_str = NULL; GError **error = NULL; @@ -122,6 +123,7 @@ } len = (*env)->GetStringUTFLength(env, filename); + jlen = (*env)->GetStringLength(env, filename); filename_str = (char *)SAFE_SIZE_ARRAY_ALLOC(malloc, sizeof(char), len + 1); if (filename_str == NULL) { @@ -132,7 +134,7 @@ free(filename_str); return JNI_FALSE; } - (*env)->GetStringUTFRegion(env, filename, 0, len, filename_str); + (*env)->GetStringUTFRegion(env, filename, 0, jlen, filename_str); jboolean result = gtk->get_file_icon_data(env, filename_str, error, icon_upcall_method, this); @@ -159,6 +161,7 @@ { #ifndef HEADLESS int len; + jsize jlen; char *stock_id_str = NULL; char *detail_str = NULL; @@ -168,25 +171,27 @@ } len = (*env)->GetStringUTFLength(env, stock_id); + jlen = (*env)->GetStringLength(env, stock_id); stock_id_str = (char *)SAFE_SIZE_ARRAY_ALLOC(malloc, sizeof(char), len + 1); if (stock_id_str == NULL) { JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); return JNI_FALSE; } - (*env)->GetStringUTFRegion(env, stock_id, 0, len, stock_id_str); + (*env)->GetStringUTFRegion(env, stock_id, 0, jlen, stock_id_str); /* Detail isn't required so check for NULL. */ if (detail != NULL) { len = (*env)->GetStringUTFLength(env, detail); + jlen = (*env)->GetStringLength(env, detail); detail_str = (char *)SAFE_SIZE_ARRAY_ALLOC(malloc, sizeof(char), len + 1); if (detail_str == NULL) { JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); return JNI_FALSE; } - (*env)->GetStringUTFRegion(env, detail, 0, len, detail_str); + (*env)->GetStringUTFRegion(env, detail, 0, jlen, detail_str); } if (!init_method(env, this) ) {