diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-06-30 13:08:58 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@redhat.com> | 2003-06-30 13:08:58 +0000 |
| commit | 655b059764387238d83da7ecddf07ecfe214af9f (patch) | |
| tree | 8b43b02a3a7f871a347c41418ba72c2490e5c9b1 | |
| parent | 645578052429e8b09e01e9885d2637eac5df3b29 (diff) | |
| download | freetype2-655b059764387238d83da7ecddf07ecfe214af9f.tar.gz | |
2003-06-25 Owen Taylor <otaylor@redhat.com>
* src/sfnt/ttload.c (tt_face_load_hdmx): Don't assign
num_records until we actually decide to load the table,
otherwise, we'll segfault in tt_face_free_hdmx.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/sfnt/ttload.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2003-06-25 Owen Taylor <otaylor@redhat.com> + + * src/sfnt/ttload.c (tt_face_load_hdmx): Don't assign + num_records until we actually decide to load the table, + otherwise, we'll segfault in tt_face_free_hdmx. + 2003-06-24 Werner Lemberg <wl@gnu.org> * src/cff/cffdrivr.c (cff_get_glyph_name): Protect agains zero diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index bea78d4f4..13b7e8677 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -1776,6 +1776,7 @@ FT_Memory memory = stream->memory; TT_Hdmx hdmx = &face->hdmx; + FT_Short num_records; FT_Long num_glyphs; FT_Long record_size; @@ -1793,7 +1794,7 @@ goto Exit; hdmx->version = FT_GET_USHORT(); - hdmx->num_records = FT_GET_SHORT(); + num_records = FT_GET_SHORT(); record_size = FT_GET_LONG(); FT_FRAME_EXIT(); @@ -1802,9 +1803,10 @@ if ( hdmx->version != 0 ) goto Exit; - if ( FT_NEW_ARRAY( hdmx->records, hdmx->num_records ) ) + if ( FT_NEW_ARRAY( hdmx->records, num_records ) ) goto Exit; + hdmx->num_records = num_records; num_glyphs = face->root.num_glyphs; record_size -= num_glyphs + 2; |