[freetype2] master 1e55060 1/3: [base] Fix error handing in MM functions.

[Werner LEMBERG]

branch: master
commit 1e550601094ea240c90cfd68070699d4bd5c8c5d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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 6294dfd..bb8dca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-01-31  Werner Lemberg  <address@hidden>
 
+       [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  <address@hidden>
+
        [truetype] Fix sanity check for `gvar' table (#50184).
 
        * src/truetype/ttgxvar.c (ft_var_load_gvar): There might be missing
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index b8db3c5..5705f21 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 )