[cairo-commit] 2 commits - src/cairo-cff-subset.c

[GitLab Mirror]

 src/cairo-cff-subset.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 267d0e1c988c1780f5131d098d87916ece51eece
Merge: 5ae89cf30 a5b567961
Author: Uli Schlachter <psychon at znc.in>
Date:   Wed Jun 2 10:23:26 2021 +0000

    Merge branch 'issue_488' into 'master'
    
    Allow empty postscript name when using a CFF font in pdf
    
    Closes #488
    
    See merge request cairo/cairo!186

commit a5b5679610a211b8b65be92559d94104837f7b70
Author: Calixte Denizet <calixte.denizet at gmail.com>
Date:   Wed May 26 19:21:04 2021 +0200

    Allow empty postscript name when using a CFF font in pdf
      - it aims to fix issue #488.

diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index d0597c213..8548ae3fe 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -554,7 +554,7 @@ cff_index_append_copy (cairo_array_t *index,
     element.length = length;
     element.is_copy = TRUE;
     element.data = _cairo_malloc (element.length);
-    if (unlikely (element.data == NULL))
+    if (unlikely (element.data == NULL && length != 0))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     memcpy (element.data, object, element.length);