Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at 2022-04-22 21:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype2 (Old) and /work/SRC/openSUSE:Factory/.freetype2.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype2" Fri Apr 22 21:52:56 2022 rev:94 rq:970868 version:2.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/freetype2/freetype2.changes 2022-04-19 09:58:00.391544144 +0200 +++ /work/SRC/openSUSE:Factory/.freetype2.new.1538/freetype2.changes 2022-04-22 21:53:21.042744223 +0200 @@ -1,0 +2,7 @@ +Tue Apr 19 09:52:21 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- add revert-ft212-subpixel-hinting-change.patch (bsc#1198536) +- add 079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch to avoid + an integer overflow occuring during fuzzing + +------------------------------------------------------------------- New: ---- 079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch revert-ft212-subpixel-hinting-change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.rqKsL4/_old 2022-04-22 21:53:21.874745171 +0200 +++ /var/tmp/diff_new_pack.rqKsL4/_new 2022-04-22 21:53:21.882745179 +0200 @@ -38,6 +38,8 @@ Patch3: enable-subpixel-rendering.patch Patch4: enable-infinality-subpixel-hinting.patch Patch5: freetype-2.12.0-cff_slot_load-segfault.patch +Patch6: https://gitlab.freedesktop.org/freetype/freetype/-/commit/079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch +Patch7: revert-ft212-subpixel-hinting-change.patch BuildRequires: gawk BuildRequires: libbz2-devel BuildRequires: libpng-devel ++++++ 079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch ++++++ >From 079a22da037835daf5be2bd9eccf7bc1eaa2e783 Mon Sep 17 00:00:00 2001 From: Werner Lemberg <w...@gnu.org> Date: Tue, 19 Apr 2022 09:28:21 +0200 Subject: [PATCH] * src/truetype/ttgload.c (TT_Process_Simple_Glyph): Integer overflow. Reported as https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=46792 --- src/truetype/ttgload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 0ecde22b7..2ca63d65a 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1104,8 +1104,8 @@ for ( ; vec < limit; vec++, u++ ) { - vec->x = ( FT_MulFix( u->x, x_scale ) + 32 ) >> 6; - vec->y = ( FT_MulFix( u->y, y_scale ) + 32 ) >> 6; + vec->x = ADD_LONG( FT_MulFix( u->x, x_scale ), 32 ) >> 6; + vec->y = ADD_LONG( FT_MulFix( u->y, y_scale ), 32 ) >> 6; } } else -- GitLab ++++++ revert-ft212-subpixel-hinting-change.patch ++++++ temporary revert of https://gitlab.freedesktop.org/freetype/freetype/-/commit/7809007a5b88b15207d6c6680cd8a979b122eafa.patch due to https://gitlab.freedesktop.org/freetype/freetype/-/issues/1148 --- freetype-2.12.0/src/truetype/ttgload.c 2022-03-30 13:17:39.000000000 +0200 +++ freetype-2.12.0/src/truetype/ttgload.c 2022-04-19 11:48:18.687226973 +0200 @@ -2691,28 +2691,6 @@ exec->ignore_x_mode = FALSE; #endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */ -#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL - /* - * Toggle backward compatibility according to what font wants, except - * when - * - * 1) we have a `tricky' font that heavily relies on the interpreter to - * render glyphs correctly, for example DFKai-SB, or - * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested. - * - * In those cases, backward compatibility needs to be turned off to get - * correct rendering. The rendering is then completely up to the - * font's programming. - * - */ - if ( driver->interpreter_version == TT_INTERPRETER_VERSION_40 && - subpixel_hinting_lean && - !FT_IS_TRICKY( glyph->face ) ) - exec->backward_compatibility = !( exec->GS.instruct_control & 4 ); - else - exec->backward_compatibility = FALSE; -#endif /* TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL */ - exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC ); loader->exec = exec; loader->instructions = exec->glyphIns; --- freetype-2.12.0/src/truetype/ttinterp.c 2022-01-27 08:43:19.000000000 +0100 +++ freetype-2.12.0/src/truetype/ttinterp.c 2022-04-19 11:46:46.185783645 +0200 @@ -7770,6 +7770,35 @@ #endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */ +#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY + exc->iup_called = FALSE; +#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */ + +#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL + /* + * Toggle backward compatibility according to what font wants, except + * when + * + * 1) we have a `tricky' font that heavily relies on the interpreter to + * render glyphs correctly, for example DFKai-SB, or + * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested. + * + * In those cases, backward compatibility needs to be turned off to get + * correct rendering. The rendering is then completely up to the + * font's programming. + * + */ + if ( SUBPIXEL_HINTING_MINIMAL && + exc->subpixel_hinting_lean && + !FT_IS_TRICKY( &exc->face->root ) ) + exc->backward_compatibility = !( exc->GS.instruct_control & 4 ); + else + exc->backward_compatibility = FALSE; + + exc->iupx_called = FALSE; + exc->iupy_called = FALSE; +#endif + /* We restrict the number of twilight points to a reasonable, */ /* heuristic value to avoid slow execution of malformed bytecode. */ num_twilight_points = FT_MAX( 30,
