1 files changed, 40 insertions, 57 deletions

diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index d33bdad64..52f8ea8bc 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -437,7 +437,8 @@
 
     if ( IS_HINTED( load->load_flags ) )
     {
-      FT_ULong  tmp;
+      TT_ExecContext  exec = load->exec;
+      FT_Memory       memory = exec->memory;
 
 
       /* check instructions size */
@@ -449,24 +450,19 @@
       }
 
       /* we don't trust `maxSizeOfInstructions' in the `maxp' table */
-      /* and thus update the bytecode array size by ourselves       */
+      /* and thus allocate the bytecode array size by ourselves     */
+      if ( n_ins )
+      {
+        if ( FT_QNEW_ARRAY( exec->glyphIns, n_ins ) )
+          return error;
 
-      tmp   = load->exec->glyphSize;
-      error = Update_Max( load->exec->memory,
-                          &tmp,
-                          sizeof ( FT_Byte ),
-                          (void*)&load->exec->glyphIns,
-                          n_ins );
+        FT_MEM_COPY( exec->glyphIns, p, (FT_Long)n_ins );
 
-      load->exec->glyphSize = (FT_UInt)tmp;
-      if ( error )
-        return error;
-
-      load->glyph->control_len  = n_ins;
-      load->glyph->control_data = load->exec->glyphIns;
+        exec->glyphSize  = n_ins;
 
-      if ( n_ins )
-        FT_MEM_COPY( load->exec->glyphIns, p, (FT_Long)n_ins );
+        load->glyph->control_len  = n_ins;
+        load->glyph->control_data = exec->glyphIns;
+      }
     }
 
 #endif /* TT_USE_BYTECODE_INTERPRETER */
@@ -1331,12 +1327,12 @@
                               FT_UInt    start_contour )
   {
     FT_Error     error;
-    FT_Outline*  outline;
+    FT_Outline*  outline = &loader->gloader->base.outline;
+    FT_Stream    stream = loader->stream;
+    FT_UShort    n_ins;
     FT_UInt      i;
 
 
-    outline = &loader->gloader->base.outline;
-
     /* make room for phantom points */
     error = FT_GLYPHLOADER_CHECK_POINTS( loader->gloader,
                                          outline->n_points + 4,
@@ -1351,53 +1347,40 @@
 
 #ifdef TT_USE_BYTECODE_INTERPRETER
 
-    {
-      FT_Stream  stream = loader->stream;
-      FT_UShort  n_ins, max_ins;
-      FT_ULong   tmp;
+    /* TT_Load_Composite_Glyph only gives us the offset of instructions */
+    /* so we read them here                                             */
+    if ( FT_STREAM_SEEK( loader->ins_pos ) ||
+         FT_READ_USHORT( n_ins )           )
+      return error;
 
+    FT_TRACE5(( "  Instructions size = %hu\n", n_ins ));
 
-      /* TT_Load_Composite_Glyph only gives us the offset of instructions */
-      /* so we read them here                                             */
-      if ( FT_STREAM_SEEK( loader->ins_pos ) ||
-           FT_READ_USHORT( n_ins )           )
-        return error;
+    if ( !n_ins )
+      return FT_Err_Ok;
 
-      FT_TRACE5(( "  Instructions size = %hu\n", n_ins ));
-
-      /* check it */
-      max_ins = loader->face->max_profile.maxSizeOfInstructions;
-      if ( n_ins > max_ins )
-      {
-        /* don't trust `maxSizeOfInstructions'; */
-        /* only do a rough safety check         */
-        if ( n_ins > loader->byte_len )
-        {
-          FT_TRACE1(( "TT_Process_Composite_Glyph:"
-                      " too many instructions (%hu) for glyph with length %u\n",
-                      n_ins, loader->byte_len ));
-          return FT_THROW( Too_Many_Hints );
-        }
+    /* don't trust `maxSizeOfInstructions'; */
+    /* only do a rough safety check         */
+    if ( n_ins > loader->byte_len )
+    {
+      FT_TRACE1(( "TT_Process_Composite_Glyph:"
+                  " too many instructions (%hu) for glyph with length %u\n",
+                  n_ins, loader->byte_len ));
+      return FT_THROW( Too_Many_Hints );
+    }
 
-        tmp   = loader->exec->glyphSize;
-        error = Update_Max( loader->exec->memory,
-                            &tmp,
-                            sizeof ( FT_Byte ),
-                            (void*)&loader->exec->glyphIns,
-                            n_ins );
+    {
+      TT_ExecContext  exec = loader->exec;
+      FT_Memory       memory = exec->memory;
 
-        loader->exec->glyphSize = (FT_UShort)tmp;
-        if ( error )
-          return error;
-      }
-      else if ( n_ins == 0 )
-        return FT_Err_Ok;
 
-      if ( FT_STREAM_READ( loader->exec->glyphIns, n_ins ) )
+      if ( FT_QNEW_ARRAY( exec->glyphIns, n_ins )  ||
+           FT_STREAM_READ( exec->glyphIns, n_ins ) )
         return error;
 
-      loader->glyph->control_data = loader->exec->glyphIns;
+      exec->glyphSize = n_ins;
+
       loader->glyph->control_len  = n_ins;
+      loader->glyph->control_data = exec->glyphIns;
     }
 
 #endif