From 1e550601094ea240c90cfd68070699d4bd5c8c5d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 31 Jan 2017 18:47:10 +0100 Subject: [PATCH] [base] Fix error handing in MM functions. * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): Implement it. --- ChangeLog | 8 ++++++++ src/base/ftmm.c | 12 +++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6294dfdac..bb8dca124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-01-31 Werner Lemberg + + [base] Fix error handing in MM functions. + + * src/base/ftmm.c (FT_Set_Var_Design_Coordinates, + FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates): + Implement it. + 2017-01-31 Werner Lemberg [truetype] Fix sanity check for `gvar' table (#50184). diff --git a/src/base/ftmm.c b/src/base/ftmm.c index b8db3c566..5705f217d 100644 --- a/src/base/ftmm.c +++ b/src/base/ftmm.c @@ -205,7 +205,9 @@ error = service_mm->set_var_design( face, num_coords, coords ); } - error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) + error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) { if ( service_mvar->metrics_adjust ) @@ -276,7 +278,9 @@ error = service_mm->set_mm_blend( face, num_coords, coords ); } - error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) + error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) { if ( service_mvar->metrics_adjust ) @@ -322,7 +326,9 @@ error = service_mm->set_mm_blend( face, num_coords, coords ); } - error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) + error = ft_face_get_mvar_service( face, &service_mvar ); + if ( !error ) { if ( service_mvar->metrics_adjust )