vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun 
Dec 11 18:06:21 2011 +0100| [bcee2c569d3e59e8e0302caca1d0a7e0d6cc2912] | 
committer: Jean-Baptiste Kempf

Fix potential Freetype crash

Close #5648
(cherry picked from commit e58a689e830f183b649f0ce1908407f8c4636e61)

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

 modules/text_renderer/freetype.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 674731b..3849e5a 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -625,7 +625,7 @@ static char* Win32_Select( filter_t *p_filter, const char* 
family,
 {
     VLC_UNUSED( i_size );
 
-    if( strlen( family ) < 1 )
+    if( !family || strlen( family ) < 1 )
         goto fail;
 
     /* */

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to