[openjdk-8] 03/03: Refreshed jexec.diff.in

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit efd29e64f37ffddd0b026348af776287caa04f05
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 1 00:31:48 2014 +0200

    Refreshed jexec.diff.in
---
 debian/patches/jexec.diff.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/jexec.diff.in b/debian/patches/jexec.diff.in
index 3e17f3c..5f343a1 100644
--- a/debian/patches/jexec.diff.in
+++ b/debian/patches/jexec.diff.in
@@ -1,7 +1,7 @@
---- openjdk/jdk/src/solaris/bin/jexec.c
-+++ openjdk/jdk/src/solaris/bin/jexec.c
-@@ -164,9 +164,10 @@
- 
+--- a/jdk/src/solaris/bin/jexec.c
++++ b/jdk/src/solaris/bin/jexec.c
+@@ -168,9 +168,10 @@
+
      /* Get the path to the java binary, which is in a known position relative
       * to our current position, which is in argv[0]. */
 -    if (getJavaPath(argv[argi++], java, RELATIVE_DEPTH) != 0) {
@@ -9,6 +9,6 @@
          errorExit(errno, MISSING_JAVA_MSG);
      }
 +    argi++;
- 
-     nargv = (const char **) malloc((argc + 2) * (sizeof (const char *)));
-     nargv[nargc++] = java;
+     alen = (argc + 2) * (sizeof (const char *));
+     if (alen <= 0 || alen > INT_MAX / sizeof(char *)) {
+         errorExit(errno, BAD_ARG_MSG);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git