summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2010-06-25 09:02:18 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2010-06-25 10:48:12 +0900
commitc69891a1345640096fbf396e8dd567fe879ce233 (patch)
tree563e46ca18f0b79ff0b531268384563bfa696f12
parent6fc12943e99b05f489b634e79b5cd590eb7ffc3f (diff)
downloadfreetype2-c69891a1345640096fbf396e8dd567fe879ce233.tar.gz
Initial fix for Savannah bug #30248 and #30249.
* src/base/ftobjs.c (Mac_Read_POST_Resource): Check the error during reading a PFB fragment embedded in LaserWriter PS font for Macintosh. Reported by Robert Swiecki.
-rw-r--r--ChangeLog8
-rw-r--r--src/base/ftobjs.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5119c6d..6669597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-25 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ Initial fix for Savannah bug #30248 and #30249.
+
+ * src/base/ftobjs.c (Mac_Read_POST_Resource): Check the error during
+ reading a PFB fragment embedded in LaserWriter PS font for Macintosh.
+ Reported by Robert Swiecki.
+
2010-06-24 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #30247.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 17fa820..32d4417 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1574,6 +1574,8 @@
}
error = FT_Stream_Read( stream, (FT_Byte *)pfb_data + pfb_pos, rlen );
+ if ( error )
+ goto Exit2;
pfb_pos += rlen;
}