diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-07-26 14:50:09 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-26 14:50:09 +0000 |
commit | d9bc5be8cdd1d4ee887330709a92e81a43f0bbae (patch) | |
tree | 107f74115f0a11f0d12174870e6a03455ebfd601 /pango | |
parent | ce09aeccb4d1594d900dfd57a9a50dfc845046be (diff) | |
download | pango-d9bc5be8cdd1d4ee887330709a92e81a43f0bbae.tar.gz |
Fix various memory leaks from error returns that should have been jumps to
Sat Jul 26 10:43:20 2003 Owen Taylor <otaylor@redhat.com>
* 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)
Diffstat (limited to 'pango')
-rw-r--r-- | pango/opentype/ftxgpos.c | 8 | ||||
-rw-r--r-- | pango/opentype/ftxgsub.c | 4 |
2 files changed, 6 insertions, 6 deletions
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; } |