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 27c8ad5cd8591db742dbf2000ca0d2b08b2c3675
Merge: b3d578ec2 5223f0c93
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Apr 27 21:39:13 2024 +0000

    Merge branch '838-confidential-issue' into 'master'
    
    Switch to calloc in _cairo_cff_font_fallback_create
    
    Closes #838
    
    See merge request cairo/cairo!545

commit 5223f0c93296e2b589fd705746d8151584855db0
Author: Daniel Holbert <dholbert at cs.stanford.edu>
Date:   Thu Apr 25 16:44:00 2024 -0700

    Switch to calloc in _cairo_cff_font_fallback_create
    
    This makes this function more consistent with _cairo_cff_font_create, the other
    function in this file that allocates fonts.

diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index b1c665daa..fd74d2ddc 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -3160,7 +3160,7 @@ _cairo_cff_font_fallback_create (cairo_scaled_font_subset_t  *scaled_font_subset
     cairo_status_t status;
     cairo_cff_font_t *font;
 
-    font = _cairo_malloc (sizeof (cairo_cff_font_t));
+    font = calloc (1, sizeof (cairo_cff_font_t));
     if (unlikely (font == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);