From d9bc5be8cdd1d4ee887330709a92e81a43f0bbae Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 26 Jul 2003 14:50:09 +0000 Subject: Fix various memory leaks from error returns that should have been jumps to Sat Jul 26 10:43:20 2003 Owen Taylor * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: Fix various memory leaks from error returns that should have been jumps to cleanup blocks. (From Qt, Lars Knoll) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/opentype/ftxgpos.c | 8 ++++---- pango/opentype/ftxgsub.c | 4 ++-- 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45061f2f..9855f341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 45061f2f..9855f341 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 45061f2f..9855f341 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 45061f2f..9855f341 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 45061f2f..9855f341 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + Sat Jul 26 10:30:24 2003 Owen Taylor * pango/opentype/ftxgpos.c: Fix additional places where diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 96eb80ef..10267e0a 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -4067,7 +4067,7 @@ while ( CHECK_Property( gdef, s_in[j], flags, &property ) ) { if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End; if ( in->pos + j < in->length ) j++; @@ -4081,7 +4081,7 @@ error = Get_Class( &cpf2->ClassDef, s_in[j], &classes[i], NULL ); if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End; known_classes = i; } @@ -5456,7 +5456,7 @@ while ( CHECK_Property( gdef, s_in[j], flags, &property ) ) { if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End1; if ( j > curr_pos ) j--; @@ -5530,7 +5530,7 @@ while ( CHECK_Property( gdef, s_in[j], flags, &property ) ) { if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End1; if ( curr_pos + j < in->length ) j++; diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 5ab95588..c2a59baa 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -2253,7 +2253,7 @@ while ( CHECK_Property( gdef, s_in[j], flags, &property ) ) { if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End; if ( in->pos + j < in->length ) j++; @@ -2267,7 +2267,7 @@ error = Get_Class( &csf2->ClassDef, s_in[j], &classes[i], NULL ); if ( error && error != TTO_Err_Not_Covered ) - return error; + goto End; known_classes = i; } -- cgit v1.2.1