--- a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c	Mon Mar 02 12:56:22 2015 -0800
+++ b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c	Mon Mar 02 08:19:11 2015 -0800
@@ -611,7 +611,11 @@
         if (access(libjava, F_OK) == 0) {
             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 the app ship a private JRE in <apphome>/jre directory? */
         JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path);
         if (access(libjava, F_OK) == 0) {