commit 80ccd42e9ebbf559426452e727a974af6cdf883f
author asaha <none@none> Thu Apr 16 21:08:04 2009 -0700
committer asaha <none@none> Thu Apr 16 21:08:04 2009 -0700
tree 31fad64280f11a21153fc6ed73405afb5d767eac
parent dfe31157a95d3b5c2261abe524014c220ef1472c
parent d8247e58cb0977b5c34aca74a37030687bbc265e

Merge

src/share/bin/java.c

diff --git a/src/share/bin/java.c b/src/share/bin/java.c
index 0feafc1..1801633 100644
--- a/src/share/bin/java.c
+++ b/src/share/bin/java.c
@@ -915,8 +915,14 @@
      * to avoid locating, expanding and parsing the manifest extra
      * times.
      */
-    if (info.main_class != NULL)
-        (void)JLI_StrCat(env_entry, info.main_class);
+    if (info.main_class != NULL) {
+        if (JLI_StrLen(info.main_class) <= MAXNAMELEN) {
+            (void)JLI_StrCat(env_entry, info.main_class);
+        } else {
+            JLI_ReportErrorMessage(CLS_ERROR5, MAXNAMELEN);
+            exit(1);
+        }
+    }
     (void)putenv(env_entry);
     ExecJRE(jre, new_argv);
     JLI_FreeManifest();