fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 20:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'moz-bug-1897561' into 'master'

Browse source 
Fix crash if font error in recording surface

See merge request cairo/cairo!551
This commit is contained in:
Emmanuele Bassi 2024-05-21 11:56:52 +00:00
commit 4b775b97bf
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cairo-recording-surface.c
View file

@ -480,7 +480,7 @@ _cairo_recording_surface_region_array_destroy (cairo_recording_surface_t *
cairo_recording_region_element_t *region_elements;
int i, num_elements;
num_elements = surface->commands.num_elements;
num_elements = MIN(surface->commands.num_elements, _cairo_array_num_elements(&region_array->regions));
elements = _cairo_array_index (&surface->commands, 0);
region_elements = _cairo_array_index (&region_array->regions, 0);
for (i = 0; i < num_elements; i++) {
@ -1154,6 +1154,10 @@ _cairo_recording_surface_show_text_glyphs (void *abstract_surface,
command->cluster_flags = cluster_flags;
status = scaled_font->status;
if (unlikely (status))
goto CLEANUP_ARRAYS;
command->scaled_font = cairo_scaled_font_reference (scaled_font);
status = _cairo_recording_surface_commit (surface, &command->header);