[freetype2] master 6b35493: * src/cid/cidload.c (cid_face_open): Properly propagate `error'.

[Werner LEMBERG]

branch: master
commit 6b354931151043015469237fff361628fcd2efca
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/cid/cidload.c (cid_face_open): Properly propagate `error'.
---
 ChangeLog         |    4 ++++
 src/cid/cidload.c |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be85355..1024f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-10-08  Werner Lemberg  <address@hidden>
 
+       * src/cid/cidload.c (cid_face_open): Properly propagate `error'.
+
+2016-10-08  Werner Lemberg  <address@hidden>
+
        [cid] Fix parsing of subr offsets.
 
        Bug introduced 2016-05-16.
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index a0a5c24..15d9623 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -733,9 +733,11 @@
       }
 
       /* we must convert the data section from hexadecimal to binary */
-      if ( FT_ALLOC( face->binary_data, parser->binary_length )         ||
-           cid_hex_to_binary( face->binary_data, parser->binary_length,
-                              parser->data_offset, face )               )
+      if ( FT_ALLOC( face->binary_data, parser->binary_length ) ||
+           ( error = cid_hex_to_binary( face->binary_data,
+                                        parser->binary_length,
+                                        parser->data_offset,
+                                        face ) )                )
         goto Exit;
 
       FT_Stream_OpenMemory( face->cid_stream,