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

Merge branch 'master' into 'master'

Browse source 
fix SEGV in cairo_type1_font functioons

See merge request cairo/cairo!497
This commit is contained in:
Uli Schlachter 2023-07-22 06:08:22 +00:00
commit 89f272e3d9
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cairo-type1-subset.c
View file

@ -1085,6 +1085,9 @@ cairo_type1_font_for_each_subr (cairo_type1_font_subset_t *font,
/* Skip binary data and | or NP token. */
p = skip_token (subr_string + subr_length, cleartext_end);
if (p == NULL)
return CAIRO_INT_STATUS_UNSUPPORTED;
while (p < cleartext_end && _cairo_isspace(*p))
p++;
@ -1248,6 +1251,9 @@ cairo_type1_font_subset_for_each_glyph (cairo_type1_font_subset_t *font,
/* Skip binary data and |- or ND token. */
p = skip_token (charstring + charstring_length, dict_end);
if (p == NULL)
return CAIRO_INT_STATUS_UNSUPPORTED;
while (p < dict_end && _cairo_isspace(*p))
p++;