diff options
author | Adrian Johnson <ajohnson@redneon.com> | 2023-02-11 04:18:03 +0000 |
---|---|---|
committer | Adrian Johnson <ajohnson@redneon.com> | 2023-02-11 04:18:03 +0000 |
commit | f2f2d20a367be0e120dc901089d1fd294094a8f2 (patch) | |
tree | 14d8e74e0e797b538389ac2256a98401f8d3cb99 | |
parent | 876ee0bb49e2bf94bbc4d06514459ae6a31935b2 (diff) | |
parent | e85c242f0a4306f829b9587233dd366f2443a620 (diff) | |
download | cairo-f2f2d20a367be0e120dc901089d1fd294094a8f2.tar.gz |
Merge branch 'fix-valgrind-errors' into 'master'
Fix some problems found by valgrind
See merge request cairo/cairo!452
-rw-r--r-- | src/cairo-font-options.c | 35 | ||||
-rw-r--r-- | src/cairo-gstate.c | 2 | ||||
-rw-r--r-- | src/cairo-truetype-subset.c | 6 | ||||
-rw-r--r-- | src/cairoint.h | 4 |
4 files changed, 45 insertions, 2 deletions
diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c index fa3d3c4e1..33ee617b8 100644 --- a/src/cairo-font-options.c +++ b/src/cairo-font-options.c @@ -105,6 +105,41 @@ _cairo_font_options_init_copy (cairo_font_options_t *options, } } +cairo_bool_t +_cairo_font_options_compare (const cairo_font_options_t *a, + const cairo_font_options_t *b) +{ + if (a->antialias != b->antialias || + a->subpixel_order != b->subpixel_order || + a->lcd_filter != b->lcd_filter || + a->hint_style != b->hint_style || + a->hint_metrics != b->hint_metrics || + a->round_glyph_positions != b->round_glyph_positions || + a->color_mode != b->color_mode || + a->palette_index != b->palette_index || + a->custom_palette_size != b->custom_palette_size) + { + return FALSE; + } + + if (a->variations && b->variations && strcmp (a->variations, b->variations) != 0) + return FALSE; + else if (a->variations != b->variations) + return FALSE; + + if (a->custom_palette && b->custom_palette && + memcmp (a->custom_palette, b->custom_palette, sizeof (cairo_palette_color_t) * a->custom_palette_size) != 0) + { + return FALSE; + } + else if (a->custom_palette != b->custom_palette) + { + return FALSE; + } + + return TRUE; +} + /** * cairo_font_options_create: * diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index 0f4fd541a..8a253468d 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -1748,7 +1748,7 @@ void _cairo_gstate_set_font_options (cairo_gstate_t *gstate, const cairo_font_options_t *options) { - if (memcmp (options, &gstate->font_options, sizeof (cairo_font_options_t)) == 0) + if (_cairo_font_options_compare (options, &gstate->font_options)) return; _cairo_gstate_unset_scaled_font (gstate); diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c index 91ee0e90b..78c7dd5ec 100644 --- a/src/cairo-truetype-subset.c +++ b/src/cairo-truetype-subset.c @@ -1471,10 +1471,14 @@ find_name (tt_name_t *name, unsigned long size, int name_id, int platform, int e if (offset + len > size) return _cairo_error (CAIRO_STATUS_NO_MEMORY); - str = _cairo_strndup (((char*)name) + offset, len); + str = _cairo_malloc (len + 1); if (str == NULL) return _cairo_error (CAIRO_STATUS_NO_MEMORY); + memcpy (str, + ((char*)name) + offset, + len); + str[len] = 0; break; } } diff --git a/src/cairoint.h b/src/cairoint.h index 5ce747ee4..6682e4b30 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -897,6 +897,10 @@ cairo_private void _cairo_font_options_init_copy (cairo_font_options_t *options, const cairo_font_options_t *other); +cairo_private cairo_bool_t +_cairo_font_options_compare (const cairo_font_options_t *a, + const cairo_font_options_t *b); + cairo_private void _cairo_font_options_fini (cairo_font_options_t *options); |