diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-07-26 23:14:36 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-07-26 23:14:36 +0000 |
| commit | 581ef4ec55bfddce03accf07df8cf032a43296d1 (patch) | |
| tree | 315a4a5fe5e9fcb41efa2e4e6226abe966b9c98b | |
| parent | ebc93967c628bf9110db2a00a8487926d66ed8d4 (diff) | |
| download | pango-581ef4ec55bfddce03accf07df8cf032a43296d1.tar.gz | |
Fix allocation and indexing in NewGlyphClasses array. (#130661, Masatake
Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgdef.c: Fix allocation and indexing
in NewGlyphClasses array. (#130661, Masatake YAMATO)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/opentype/ftxgdef.c | 14 |
5 files changed, 27 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + Mon Jul 26 15:21:23 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c: Add missing macro to make the diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 11b2ecf5..2c31950f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + Mon Jul 26 15:21:23 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c: Add missing macro to make the diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 11b2ecf5..2c31950f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + Mon Jul 26 15:21:23 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c: Add missing macro to make the diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 11b2ecf5..2c31950f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + Mon Jul 26 15:21:23 2004 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c: Add missing macro to make the diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c index 9077490b..85694ba2 100644 --- a/pango/opentype/ftxgdef.c +++ b/pango/opentype/ftxgdef.c @@ -773,7 +773,7 @@ glyph_index = glyphID - gcrr[index].End - 1; } - byte = ngc[array_index][glyph_index / 4 + 1]; + byte = ngc[array_index][glyph_index / 4]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); return bits & 0x000F; @@ -1010,7 +1010,7 @@ if ( gcrr[0].Start ) { - if ( ALLOC_ARRAY( ngc[0], gcrr[0].Start / 4 + 1, FT_UShort ) ) + if ( ALLOC_ARRAY( ngc[0], ( gcrr[0].Start + 3 ) / 4, FT_UShort ) ) goto Fail1; } @@ -1018,7 +1018,7 @@ { if ( gcrr[n].Start - gcrr[n - 1].End > 1 ) if ( ALLOC_ARRAY( ngc[n], - ( gcrr[n].Start - gcrr[n - 1].End - 1 ) / 4 + 1, + ( gcrr[n].Start - gcrr[n - 1].End + 2 ) / 4, FT_UShort ) ) goto Fail1; } @@ -1026,7 +1026,7 @@ if ( gcrr[count - 1].End != num_glyphs - 1 ) { if ( ALLOC_ARRAY( ngc[count], - ( num_glyphs - gcrr[count - 1].End - 1 ) / 4 + 1, + ( num_glyphs - gcrr[count - 1].End + 2 ) / 4, FT_UShort ) ) goto Fail1; } @@ -1141,7 +1141,7 @@ glyph_index = glyphID - gcrr[index].End - 1; } - byte = ngc[array_index][glyph_index / 4 + 1]; + byte = ngc[array_index][glyph_index / 4]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); class = bits & 0x000F; @@ -1152,8 +1152,8 @@ bits = new_class << ( 16 - ( glyph_index % 4 + 1 ) * 4 ); mask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); - ngc[array_index][glyph_index / 4 + 1] &= mask; - ngc[array_index][glyph_index / 4 + 1] |= bits; + ngc[array_index][glyph_index / 4] &= mask; + ngc[array_index][glyph_index / 4] |= bits; } return TT_Err_Ok; |