diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-01-17 15:11:12 +0800 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-01-17 15:11:12 +0800 |
| commit | db3bca7b78242764136ebc48f98868a5615162cd (patch) | |
| tree | d625082c1c53afb1bccf0fc6b10609004a126922 /java | |
| parent | bc28ed90adf92b5e33423a0e9e286766e0d0e17a (diff) | |
| download | freebsd-ports-db3bca7b78242764136ebc48f98868a5615162cd.tar.gz freebsd-ports-db3bca7b78242764136ebc48f98868a5615162cd.tar.zst freebsd-ports-db3bca7b78242764136ebc48f98868a5615162cd.zip | |
. Check the return value of stat(2) when trying to read the javaws
configuration file and behave appropriately if its -1. Fixes a SEGV
caused by ignoring the return value and just carrying on.
. Bump PORTREVISION.
PR: 61392
Notes
Notes:
svn path=/head/; revision=98375
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk14/Makefile | 1 | ||||
| -rw-r--r-- | java/jdk14/files/patch-native::util.c | 16 | ||||
| -rw-r--r-- | java/jdk15/Makefile | 1 | ||||
| -rw-r--r-- | java/jdk15/files/patch-native::util.c | 16 | ||||
| -rw-r--r-- | java/jdk16/Makefile | 1 | ||||
| -rw-r--r-- | java/jdk16/files/patch-native::util.c | 16 |
6 files changed, 51 insertions, 0 deletions
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index a89138f56b27..6c90be937a12 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk14/files/patch-native::util.c b/java/jdk14/files/patch-native::util.c new file mode 100644 index 000000000000..719d1ae0e989 --- /dev/null +++ b/java/jdk14/files/patch-native::util.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/src/share/native/util.c 22 Oct 2003 23:04:17 -0000 1.1.1.1 ++++ ../../deploy/src/javaws/src/share/native/util.c 16 Jan 2004 23:50:11 -0000 +@@ -27,7 +27,10 @@ + + /* Find size of file */ + struct stat statBuf; +- stat(filename, &statBuf); ++ if (stat(filename, &statBuf) == -1) { ++ *buffer = NULL; ++ return 0; ++ } + size = statBuf.st_size; + + /* Allocate memory for contents */ diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index a89138f56b27..6c90be937a12 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk15/files/patch-native::util.c b/java/jdk15/files/patch-native::util.c new file mode 100644 index 000000000000..719d1ae0e989 --- /dev/null +++ b/java/jdk15/files/patch-native::util.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/src/share/native/util.c 22 Oct 2003 23:04:17 -0000 1.1.1.1 ++++ ../../deploy/src/javaws/src/share/native/util.c 16 Jan 2004 23:50:11 -0000 +@@ -27,7 +27,10 @@ + + /* Find size of file */ + struct stat statBuf; +- stat(filename, &statBuf); ++ if (stat(filename, &statBuf) == -1) { ++ *buffer = NULL; ++ return 0; ++ } + size = statBuf.st_size; + + /* Allocate memory for contents */ diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index a89138f56b27..6c90be937a12 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # http://www.sun.com/software/java2/download.html # http://www.eyesbeyond.com/freebsddom/java/jdk14.html diff --git a/java/jdk16/files/patch-native::util.c b/java/jdk16/files/patch-native::util.c new file mode 100644 index 000000000000..719d1ae0e989 --- /dev/null +++ b/java/jdk16/files/patch-native::util.c @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../../deploy/src/javaws/src/share/native/util.c 22 Oct 2003 23:04:17 -0000 1.1.1.1 ++++ ../../deploy/src/javaws/src/share/native/util.c 16 Jan 2004 23:50:11 -0000 +@@ -27,7 +27,10 @@ + + /* Find size of file */ + struct stat statBuf; +- stat(filename, &statBuf); ++ if (stat(filename, &statBuf) == -1) { ++ *buffer = NULL; ++ return 0; ++ } + size = statBuf.st_size; + + /* Allocate memory for contents */ |