Changeset 117

Timestamp:

Aug 27, 2010, 12:25:02 AM (15 years ago)

Author:

dmik

Message:

jdk: Fixed: java[w].exe overwrote BEGINLIBPATH which broke loading of many DLLs in LIBPATHSTRICT=T mode.

File:

• trunk/openjdk/jdk/src/windows/bin/java_md.c (modified) (1 diff)

trunk/openjdk/jdk/src/windows/bin/java_md.c

@@ -236 +236 @@
      * they refer to it as 'JVM' instead of the full path) are able to find it.
      */
-    strcpy(crtpath, jvmpath);
-    char *sep = strrchr(crtpath, '\\');
+    char *jvmdir = (char *)malloc(strlen(jvmpath) + 1 + 32);
+    strcpy(jvmdir, jvmpath);
+    char *sep = strrchr(jvmdir, '\\');
     if (sep) {
         *sep = '\0';
-        DosSetExtLIBPATH(crtpath, BEGIN_LIBPATH);
-    }
+        strcpy(sep, ";%BEGINLIBPATH%");
+        DosSetExtLIBPATH(jvmdir, BEGIN_LIBPATH);
+    }
+    free(jvmdir);
 #endif