Commit 9967dce2b22aef49bb51ca78631e87857b521e08
2002-11-23T16:41:23
* src/cff/cffload.c (cff_charser_load): modified charset loader to accept pre-defined charsets, even when the font contains fewer glyphs. also enforced more checks to ensure that we never overflow the character codes array in the encoding.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/ChangeLog b/ChangeLog
index d4ae5ce..a4787b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
2002-11-23 David Turner <david@freetype.org>
* src/cff/cffload.c (cff_charser_load): modified charset loader to
- accept pre-defined charsets, even when the font contains fewer glyphs
+ accept pre-defined charsets, even when the font contains fewer glyphs.
+ also enforced more checks to ensure that we never overflow the
+ character codes array in the encoding.
2002-11-18 David Turner <david@freetype.org>
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index e05dec7..708af16 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1743,14 +1743,17 @@
FT_READ_BYTE( count ) )
goto Exit;
- encoding->count = count + 1;
-
switch ( encoding->format & 0x7F )
{
case 0:
{
FT_Byte* p;
+ /* by convention, GID 0 is always ".notdef" and is never */
+ /* coded in the font. Hence, the number of codes found */
+ /* in the table is 'count+1' */
+ /* */
+ encoding->count = count + 1;
if ( FT_FRAME_ENTER( count ) )
goto Exit;
@@ -1762,7 +1765,7 @@
glyph_code = *p++;
/* Make sure j is not too big. */
- if ( (FT_UInt) glyph_code < num_glyphs )
+ if ( j < num_glyphs )
{
/* Assign code to GID mapping. */
encoding->codes[glyph_code] = (FT_UShort)j;
@@ -1783,6 +1786,8 @@
FT_UInt k;
+ encoding->count = 0;
+
/* Parse the Format1 ranges. */
for ( j = 0; j < count; j++, i += nleft )
{
@@ -1796,7 +1801,11 @@
/* Increment nleft, so we read `nleft + 1' codes/sids. */
nleft++;
-
+
+ /* compute max number of character codes */
+ if ( nleft > encoding->count )
+ encoding->count = nleft;
+
/* Fill in the range of codes/sids. */
for ( k = i; k < nleft + i; k++, glyph_code++ )
{
@@ -1811,6 +1820,10 @@
}
}
}
+
+ /* simple check, one never knows what can be found in a font */
+ if ( encoding->count > 256 )
+ encoding->count = 256;
}
break;
@@ -1866,8 +1879,6 @@
/* encoding (see the note at the end of section 12 in the CFF */
/* specification). */
- encoding->count = 256;
-
switch ( (FT_UInt)offset )
{
case 0:
@@ -1885,6 +1896,10 @@
Populate:
/* Construct code to GID mapping from code to SID mapping */
/* and charset. */
+
+ encoding->count = 0;
+
+
for ( j = 0; j < 256; j++ )
{
/* If j is encoded, find the GID for it. */
@@ -1904,7 +1919,13 @@
encoding->sids [j] = 0;
}
else
+ {
encoding->codes[j] = (FT_UShort)i;
+
+ /* update encoding count */
+ if ( encoding->count < j+1 )
+ encoding->count = j+1;
+ }
}
}
break;