--- a/jdk/src/java.base/windows/native/libjli/java_md.c	Mon Mar 02 12:56:22 2015 -0800
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c	Mon Mar 02 08:19:11 2015 -0800
@@ -323,7 +323,11 @@
             JLI_TraceLauncher("JRE path is %s\n", path);
             return JNI_TRUE;
         }
-
+        /* ensure storage for path + \jre + NULL */
+        if ((JLI_StrLen(path) + 4 + 1) > (size_t) pathsize) {
+            JLI_TraceLauncher("Insufficient space to store JRE path\n");
+            return JNI_FALSE;
+        }
         /* Does this app ship a private JRE in <apphome>\jre directory? */
         JLI_Snprintf(javadll, sizeof (javadll), "%s\\jre\\bin\\" JAVA_DLL, path);
         if (stat(javadll, &s) == 0) {