diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-08-01 18:38:25 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-08-01 18:38:25 +0000 |
| commit | 44bf342005484e69eb9f8944b8d11f1885316ec7 (patch) | |
| tree | 1b9772b447c54a297ff11236be9c247fa21d11f2 /java/jdk15 | |
| parent | 2f9818eb94b97abae76286ca4fdd78514cc84ad4 (diff) | |
| download | ports-44bf342005484e69eb9f8944b8d11f1885316ec7.tar.gz ports-44bf342005484e69eb9f8944b8d11f1885316ec7.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>
Notes
Notes:
svn path=/head/; revision=169375
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk15/files/patch-j2se::font::t1.c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 3c128298688c..a0f3a0698b00 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/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/jdk15/files/patch-j2se::font::t1.c b/java/jdk15/files/patch-j2se::font::t1.c new file mode 100644 index 000000000000..7cb654bf7ff0 --- /dev/null +++ b/java/jdk15/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 ]; |