[freetype2] master 50ff6c1: * src/cff/cffload.c (cff_load_private_dict): Always init `blend'.

[Werner LEMBERG]

branch: master
commit 50ff6c1eabec6af45f26fa6b7a5bb67dd9a07f9c
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/cff/cffload.c (cff_load_private_dict): Always init `blend'.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=295
---
 ChangeLog         |    8 ++++++++
 src/cff/cffload.c |    9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b89a082..a6cc7df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-17  Werner Lemberg  <address@hidden>
+
+       * src/cff/cffload.c (cff_load_private_dict): Always init `blend'.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=295
+
 2016-12-16  Werner Lemberg  <address@hidden>
 
        [truetype] Fix `cvar' sanity test.
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index b9e052d..33e8d19 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1843,13 +1843,14 @@
     FT_UInt          stackSize;
 
 
-    if ( !top->private_offset || !top->private_size )
-      goto Exit2;       /* no private DICT, do nothing */
-
-    /* store handle needed to access memory, vstore for blend */
+    /* store handle needed to access memory, vstore for blend;    */
+    /* we need this for clean-up even if there is no private DICT */
     subfont->blend.font   = font;
     subfont->blend.usedBV = FALSE;  /* clear state */
 
+    if ( !top->private_offset || !top->private_size )
+      goto Exit2;       /* no private DICT, do nothing */
+
     /* set defaults */
     FT_ZERO( priv );