From 6ab73870df512d72aa7aec199d3e7c080d3e7cf2 Mon Sep 17 00:00:00 2001
From: naoto <unknown>
Date: Wed, 30 Jul 2014 09:20:26 -0700
Subject: [PATCH] 8048515: Read outside array bounds in
 jdk/src/solaris/native/java/lang/java_props_md.c Reviewed-by: okutsu

---
 src/share/native/java/lang/java_props.h   |  2 +-
 src/solaris/native/java/lang/locale_str.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/share/native/java/lang/java_props.h b/src/share/native/java/lang/java_props.h
index 21207d9fb..98caf63fc 100644
--- a/src/share/native/java/lang/java_props.h
+++ b/src/share/native/java/lang/java_props.h
@@ -117,7 +117,7 @@ typedef struct {
 
     char *exceptionList;
 
-    char *awt_headless  /* java.awt.headless setting, if NULL (default) will not be set */
+    char *awt_headless;  /* java.awt.headless setting, if NULL (default) will not be set */
 #endif
 
 } java_props_t;
diff --git a/src/solaris/native/java/lang/locale_str.h b/src/solaris/native/java/lang/locale_str.h
index d63e26ce3..72a796c7a 100644
--- a/src/solaris/native/java/lang/locale_str.h
+++ b/src/solaris/native/java/lang/locale_str.h
@@ -135,7 +135,7 @@
     "sr_SP", "sr_YU",
     "tchinese", "zh_TW",
 #endif
-    ""
+    "", "",
  };
 
 /*
@@ -188,7 +188,7 @@ static char *language_names[] = {
     "japanese", "ja",
     "korean", "ko",
 #endif
-    "",
+    "", "",
 };
 
 /*
@@ -201,7 +201,7 @@ static char *script_names[] = {
     "iqtelif", "Latn",
     "latin", "Latn",
 #endif
-    "",
+    "", "",
 };
 
 /*
@@ -212,7 +212,7 @@ static char *country_names[] = {
     "RN", "US", // used on Linux, not clear what it stands for
 #endif
     "YU", "CS", // YU has been removed from ISO 3166
-    "",
+    "", "",
 };
 
 /*
@@ -220,5 +220,5 @@ static char *country_names[] = {
  */
 static char *variant_names[] = {
     "nynorsk", "NY",
-    "",
+    "", "",
 };
-- 
GitLab