commit d4f845603da9a1ee59950ec4a27fede865ebbba6
author katleman <none@none> Tue Mar 25 11:46:54 2014 -0700
committer katleman <none@none> Tue Mar 25 11:46:54 2014 -0700
tree bfc557bf6ea67e8cb5f57ea05464965e3123c23e
parent 8eec775038b1ee7faea58944a743267e2d966955
parent ea0c8cd63be7e7afa85ed49c1e7581b076320bd7

Merge

src/windows/bin/java_md.c

diff --git a/src/windows/bin/java_md.c b/src/windows/bin/java_md.c
index 4078ecc..d517e92 100644
--- a/src/windows/bin/java_md.c
+++ b/src/windows/bin/java_md.c
@@ -1301,6 +1301,14 @@
             /* save path length */
             jrePathLen = JLI_StrLen(libraryPath);
 
+            if (jrePathLen + JLI_StrLen("\\bin\\verify.dll") >= MAXPATHLEN) {
+              /* jre path is too long, the library path will not fit there;
+               * report and abort preloading
+               */
+              JLI_ReportErrorMessage(JRE_ERROR11);
+              break;
+            }
+
             /* load msvcrt 1st */
             LoadMSVCRT();