[vlc-commits] freetype: fix null dereference (cid #1346944)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 31 18:36:07 2015 +0100| [07c6818558eb1033f7de5ead0e07f8e630b598e6] | committer: Francois Cartegnie

freetype: fix null dereference (cid #1346944)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07c6818558eb1033f7de5ead0e07f8e630b598e6
---

 modules/text_renderer/freetype/text_layout.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
index c795d2f..f302e9d 100644
--- a/modules/text_renderer/freetype/text_layout.c
+++ b/modules/text_renderer/freetype/text_layout.c
@@ -1261,7 +1261,7 @@ static int LayoutLine( filter_t *p_filter,
         pen.y += p_bitmaps->i_y_advance;
 
         /* Get max advance for grid mode */
-        if( b_grid && i_font_max_advance_y == 0 )
+        if( b_grid && i_font_max_advance_y == 0 && p_face )
         {
             i_font_max_advance_y = abs( FT_FLOOR( FT_MulFix( p_face->max_advance_height,
                                       p_face->size->metrics.y_scale ) ) );