aboutsummaryrefslogtreecommitdiff
path: root/java/jdk14
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-10-16 17:00:27 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-10-16 17:00:27 +0000
commite3262fa4db6bffaed06349d2ba5cbcb15707d28d (patch)
tree232f90d164f5492bf893166557f7f2bd2c317184 /java/jdk14
parent0d651b8bc688e45bdc00ab209524ecafea1698b1 (diff)
downloadports-e3262fa4db6bffaed06349d2ba5cbcb15707d28d.tar.gz
ports-e3262fa4db6bffaed06349d2ba5cbcb15707d28d.zip
Notes
Diffstat (limited to 'java/jdk14')
-rw-r--r--java/jdk14/files/patch-awt_fontmanager_fontObject.cpp53
1 files changed, 53 insertions, 0 deletions
diff --git a/java/jdk14/files/patch-awt_fontmanager_fontObject.cpp b/java/jdk14/files/patch-awt_fontmanager_fontObject.cpp
new file mode 100644
index 000000000000..3efc10e85b68
--- /dev/null
+++ b/java/jdk14/files/patch-awt_fontmanager_fontObject.cpp
@@ -0,0 +1,53 @@
+$FreeBSD$
+
+--- ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp.orig Wed Jul 7 09:33:52 2004
++++ ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp Wed Jul 7 13:26:03 2004
+@@ -416,7 +416,11 @@
+ fUseCount += 1;
+
+ if (length > 0 && fFileSize > 0) {
+- assert(offset < fFileSize);
++ if (offset >= fFileSize) {
++ fUseCount--;
++ return NULL;
++ }
++
+ if ((offset + length) > fFileSize)
+ length = fFileSize - offset;
+
+@@ -431,13 +435,14 @@
+ "fileFontObject::ReadChunk(UInt32,UInt32,void*)\n"
+ );
+ #endif
++ fUseCount--;
+ return NULL;
+ }
+
+ off_t err = lseek(fFile, offset, SEEK_SET);
+ #ifdef DEBUG
+ if (err == (off_t)-1) {
+- fprintf(stderr, "seek(%d) returned %d\n", offset, (int) err);
++ fprintf(stderr, "seek(%ld) returned %d\n", offset, (int) err);
+ }
+ #endif
+
+@@ -448,7 +453,7 @@
+ int tellvalue = lseek(fFile, 0, SEEK_END);
+ #ifdef DEBUG
+ fprintf(stderr,
+- "<%s> of %d, ln %d, rd %d, sz %d, tell %d, err %d\n",
++ "<%s> of %ld, ln %ld, rd %d, sz %ld, tell %d, err %d\n",
+ (char *)fFileName, offset, length, (int)bytesRead,
+ fFileSize, tellvalue, (int) err);
+ #endif
+@@ -1457,7 +1462,9 @@
+ return false;
+ }
+
+- this->ReadChunk(sizeof theHeader, fFontCount * sizeof *offsets, offsets);
++ if (this->ReadChunk(sizeof theHeader, fFontCount * sizeof *offsets, offsets) == NULL) {
++ return false;
++ }
+ for (int i=0; i<fFontCount; i++) {
+ offsets[i] = GET32(offsets[i]);
+ }