commit 1eaa59debb5cca8c48b3cb0f398738de0db16298
author Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Tue Sep 12 23:07:10 2017 +0300
committer Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Tue Sep 12 23:07:10 2017 +0300
tree 649bea3aaf7ea281201ece48d2e47f5ee5f9eb95
parent 248423cd64dcc801116880fc64760750eda0a606

JRE-474 Cannot build or run project using JBRE build 1003 on Windows

Added check on build number buffer size

src/share/native/common/jdk_util.c

diff --git a/src/share/native/common/jdk_util.c b/src/share/native/common/jdk_util.c
index 3dfc6d3..e32f047 100644
--- a/src/share/native/common/jdk_util.c
+++ b/src/share/native/common/jdk_util.c
@@ -36,6 +36,8 @@
    #define JDK_UPDATE_VERSION "00"
 #endif
 
+#define BUILD_NUM_BUF_LEN 6
+
 JNIEXPORT void
 JDK_GetVersionInfo0(jdk_version_info* info, size_t info_size) {
     /* These JDK_* macros are set at Makefile or the command line */
@@ -47,7 +49,7 @@
         (unsigned int) atoi(JDK_MICRO_VERSION);
 
     const char* jdk_build_string = JDK_BUILD_NUMBER;
-    char build_number[6];
+    char build_number[BUILD_NUM_BUF_LEN];
     unsigned int jdk_build_number = 0;
 
     const char* jdk_update_string = JDK_UPDATE_VERSION;
@@ -60,7 +62,9 @@
      * XX is the jdk_build_number.
      */
     int len = strlen(jdk_build_string);
-    if (jdk_build_string[0] == 'b' && len >= 2) {
+    if (jdk_build_string[0] == 'b' && len >= 2 &&
+        len <= BUILD_NUM_BUF_LEN)
+    {
         int i = 0;
         for (i = 1; i < len; i++) {
             if (isdigit(jdk_build_string[i])) {