vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 9310180d994068b0bb5ce4a8f7c4a692bc485b9c Author: Caolán McNamara <[email protected]> Date: Mon Sep 18 15:10:49 2017 +0100 ofz#3419 Null-dereference READ (cherry picked from commit 3e8ef0e1a40a14d1c2bdb5345ed59941c765356b) Conflicts: vcl/unx/generic/glyphs/freetype_glyphcache.cxx Change-Id: I32c5d5039034ac76262223e42a1f27d6f1b84cb5 Reviewed-on: https://gerrit.libreoffice.org/50567 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index db656d318a23..9f88fc5480f3 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -947,7 +947,9 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const rGD.SetCharWidth( nCharWidth ); FT_Glyph pGlyphFT; - FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT ); + rc = FT_Get_Glyph(maFaceFT->glyph, &pGlyphFT); + if (rc != FT_Err_Ok) + return; ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false ); rGD.SetDelta( (pGlyphFT->advance.x + 0x8000) >> 16, -((pGlyphFT->advance.y + 0x8000) >> 16) ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
