changeset 9790:eeefca8a78ff

Merge
author katleman
date Tue, 25 Mar 2014 11:46:54 -0700
parents b968ca3d3020 3f2487ebf4ba
children 9d89f13f576a
files
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/bin/java_md.c	Tue Mar 25 11:23:26 2014 -0700
+++ b/src/windows/bin/java_md.c	Tue Mar 25 11:46:54 2014 -0700
@@ -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();