--- freetype-2.0.1/src/cff/t2gload.c	Tue Nov 28 03:23:05 2000
+++ freetype.new/src/cff/t2gload.c	Wed Feb 28 23:26:06 2001
@@ -1983,10 +1983,20 @@
                                  &charstring, &charstring_len );
       if ( !error )
       {
+	CFF_Index csindex;
+
+	csindex = cff->charstrings_index;
         T2_Prepare_Decoder( &decoder, glyph_index );
         error = T2_Parse_CharStrings( &decoder, charstring, charstring_len );
 
         T2_Forget_Element( &cff->charstrings_index, &charstring );
+	
+	/* We set control_data and control_len if charstrings is loaded.
+	 * See how charstring loads at T2_Access_Element() in t2load.c.
+	 */
+	glyph->root.control_data = csindex.bytes + csindex.offsets[glyph_index] - 1;
+	glyph->root.control_len = charstring_len;
+	
       }
 
       /* save new glyph tables */