summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/base/ftobjs.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ec7b9bb..ca6731de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-01-11 David Turner <david@freetype.org>
+ * src/base/ftobjs.c (IsMacResource): fixed a small bug that caused a
+ crash with some Mac OS X .dfont files. Submitted by Masatake Yamoto.
+
* autogen.sh: small fix to get it working on Mac OS X properly,
the issue is that GNU libtool is called "glibtool" on this platform,
and we must call "glibtoolize", since "libtoolize" doesn't exist
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index a2e682aa..0101b70d 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1446,7 +1446,8 @@
face_index, aface );
FT_FREE( data_offsets );
/* POST exists in an LWFN providing a single face */
- (*aface)->num_faces = 1;
+ if (!error)
+ (*aface)->num_faces = 1;
return error;
}
@@ -1462,7 +1463,8 @@
error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count,
face_index_internal, aface );
FT_FREE( data_offsets );
- (*aface)->num_faces = count;
+ if (!error)
+ (*aface)->num_faces = count;
}
return error;