aboutsummaryrefslogtreecommitdiffstats
path: root/java/jdk16
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2006-08-02 02:38:25 +0800
committerglewis <glewis@FreeBSD.org>2006-08-02 02:38:25 +0800
commit48eed20755699fdd78490871dff5511ccd34c7f2 (patch)
tree3db64fe78577f194794b31b83baae4b4ad2c36b3 /java/jdk16
parent85628ea0eba4c83327194217ee8dbd288e5fcb2f (diff)
downloadfreebsd-ports-graphics-48eed20755699fdd78490871dff5511ccd34c7f2.tar.gz
freebsd-ports-graphics-48eed20755699fdd78490871dff5511ccd34c7f2.tar.zst
freebsd-ports-graphics-48eed20755699fdd78490871dff5511ccd34c7f2.zip
. Fix a segfault caused by fonts with illegal glyph names or glyph names
which begin with an underscore (although the patch doesn't handle these). . Bump PORTREVISION. Submitted by: Kurt Miller <kurt@intricatesoftware.com>
Diffstat (limited to 'java/jdk16')
-rw-r--r--java/jdk16/Makefile2
-rw-r--r--java/jdk16/files/patch-j2se::font::t1.c17
2 files changed, 18 insertions, 1 deletions
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 3c128298688..a0f3a0698b0 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk16/files/patch-j2se::font::t1.c b/java/jdk16/files/patch-j2se::font::t1.c
new file mode 100644
index 00000000000..7cb654bf7ff
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::font::t1.c
@@ -0,0 +1,17 @@
+$FreeBSD$
+
+--- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig Tue Oct 19 15:00:39 2004
++++ ../../j2se/src/share/native/sun/font/t2k/t1.c Tue Jul 18 21:42:18 2006
+@@ -2035,9 +2035,10 @@
+
+ if ( firstChar >= 'A' && firstChar <= 'Z' )
+ lookupIndex = firstChar - 'A';
+- else
++ else if ( firstChar >= 'a' && firstChar <= 'z' )
+ lookupIndex = firstChar - 'a' + 26;
+-
++ else /* underscore is also valid but not handled */
++ return 0;
+
+ startIndex = PSNAME_START_INDEX[ lookupIndex ];
+ endIndex = PSNAME_START_INDEX[ lookupIndex + 1 ];