8289049: x86_32 build fails with GCC 11 due to newString646_US warning

Reviewed-by: alanb, stuefe
openjdk · Aug 17, 2022 · 0c67fba · 0c67fba · openjdk-notifier · Aug 17, 2022
1 parent bf7d6d3
commit 0c67fba
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c
@@ -393,7 +393,7 @@ JNU_NewObjectByName(JNIEnv *env, const char *class_name,
 static jstring
 newSizedString8859_1(JNIEnv *env, const char *str, const int len)
 {
-    jchar buf[512];
+    jchar buf[512] = {0};
     jchar *str1;
     jstring result;
     int i;
@@ -412,6 +412,7 @@ newSizedString8859_1(JNIEnv *env, const char *str, const int len)
 
     for (i=0;i<len;i++)
         str1[i] = (unsigned char)str[i];
+
     result = (*env)->NewString(env, str1, len);
     if (str1 != buf)
         free(str1);
@@ -467,6 +468,9 @@ newString646_US(JNIEnv *env, const char *str)
     jstring result;
     int i;
 
+    if ((*env)->EnsureLocalCapacity(env, 1) < 0)
+        return NULL;
+
     if (len > 512) {
         str1 = (jchar *)malloc(len * sizeof(jchar));
         if (str1 == 0) {
@@ -534,7 +538,7 @@ static jstring
 newStringCp1252(JNIEnv *env, const char *str)
 {
     int len = (int) strlen(str);
-    jchar buf[512];
+    jchar buf[512] = {0};
     jchar *str1;
     jstring result;
     int i;