diff options
| author | Werner Lemberg <wl@gnu.org> | 2012-03-01 16:43:20 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2012-03-01 16:43:20 +0100 |
| commit | 6ac022dc750d95296a6f731b9594f2e751d997fa (patch) | |
| tree | 7d0f2f72943f9de8f7b14ab4408714749341b135 /src/bdf/bdflib.c | |
| parent | 7d35a7dc7cc621538a1f4a63c83ebf223aace0b0 (diff) | |
| download | freetype2-6ac022dc750d95296a6f731b9594f2e751d997fa.tar.gz | |
[bdf] Fix Savannah bug #35656.
* src/bdf/bdflib.c (_bdf_parse_glyphs) <_BDF_BITMAP>: Check validity
of nibble characters instead of accessing `a2i' array.
Diffstat (limited to 'src/bdf/bdflib.c')
| -rw-r--r-- | src/bdf/bdflib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index fc635c9b4..6a66d1d1f 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -1746,7 +1746,7 @@ for ( i = 0; i < nibbles; i++ ) { c = line[i]; - if ( !c ) + if ( !isdigok( hdigits, c ) ) break; *bp = (FT_Byte)( ( *bp << 4 ) + a2i[c] ); if ( i + 1 < nibbles && ( i & 1 ) ) @@ -1769,9 +1769,9 @@ *bp &= nibble_mask[mask_index]; /* If any line has extra columns, indicate they have been removed. */ - if ( i == nibbles && - ( line[nibbles] == '0' || a2i[(int)line[nibbles]] != 0 ) && - !( p->flags & _BDF_GLYPH_WIDTH_CHECK ) ) + if ( i == nibbles && + isdigok( hdigits, line[nibbles] ) && + !( p->flags & _BDF_GLYPH_WIDTH_CHECK ) ) { FT_TRACE2(( "_bdf_parse_glyphs: " ACMSG14, glyph->encoding )); p->flags |= _BDF_GLYPH_WIDTH_CHECK; |