Changeset 432 for trunk

Timestamp:

Oct 2, 2014, 1:18:17 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Requre PATH-located java to reside in bin/.

This is to kind of make sure that there is also lib/ where
rt.jar is expected to be.

File:

• trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.cc (modified) (2 diffs)

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.cc

@@ -79 +79 @@
             }
             if (!ok)
-                strcpy(buf, ".");
+                buf[0] = '\0';
         }
         home = buf;
@@ -110 +110 @@
                 {
                     *end = '\0';
-                    ok = TRUE;
-                    // truncate \bin if present
+                    // truncate \bin if present (otherwise this path is considered invalid)
                     end = strrchr(buf, '\\');
                     if (end && stricmp(end + 1, "bin") == 0)
+                    {
                         *end = '\0';
+                        ok = TRUE;
+                    }
                 }
             }
             if (!ok)
-                strcpy(buf, ".");
+                buf[0] = '\0';
         }
         jre = buf;