From 5edc2f339a84348effeae8db7d32fe3a96ff6d84 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Fri, 1 Oct 2010 08:15:55 +0200 Subject: [PATCH] Fix Savannah bug #31040. * src/truetype/ttinterp.c (free_buffer_in_size): Remove. (TT_RunIns): Updated. --- ChangeLog | 7 +++++++ src/truetype/ttinterp.c | 35 ----------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a754d6e6..0ab014ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-01 suzuki toshiya + + Fix Savannah bug #31040. + + * src/truetype/ttinterp.c (free_buffer_in_size): Remove. + (TT_RunIns): Updated. + 2010-09-20 suzuki toshiya [sfnt] Make error message filling NULL names less verbose. diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index f1b7ac354..bf9189c39 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -7361,38 +7361,6 @@ #endif /* !TT_CONFIG_OPTION_INTERPRETER_SWITCH */ - static void - free_buffer_in_size( TT_ExecContext exc ) - { - FT_Memory memory = exc->memory; - TT_Size size = exc->size; - - - if ( !size ) - return; - - if ( size->function_defs ) - FT_FREE( size->function_defs ); - if ( size->instruction_defs ) - FT_FREE( size->instruction_defs ); - if ( size->cvt ) - FT_FREE( size->cvt ); - if ( size->storage ) - FT_FREE( size->storage ); - - if ( size->twilight.org ) - FT_FREE( size->twilight.org ); - if ( size->twilight.cur ) - FT_FREE( size->twilight.cur ); - if ( size->twilight.orus ) - FT_FREE( size->twilight.orus ); - if ( size->twilight.tags ) - FT_FREE( size->twilight.tags ); - if ( size->twilight.contours ) - FT_FREE( size->twilight.contours ); - } - - /*************************************************************************/ /* */ /* RUN */ @@ -8165,10 +8133,7 @@ if ( CUR.error && !CUR.instruction_trap ) { FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error )); - free_buffer_in_size( exc ); - exc->size->cvt_ready = FALSE; - exc->size->bytecode_ready = FALSE; } return CUR.error;