Mercurial > mplayer.hg

diff libass/ass_drawing.c @ 32556:34215c3e6e10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check the validity of an argument, font. If opening a font file when using -ass fails, 'font' becomes NULL and causes MPlayer to crash.
author komh
date Tue, 23 Nov 2010 14:44:26 +0000
parents ac6e48baa03d
children 88eebbbbd6a0
line wrap: on
line diff
--- a/libass/ass_drawing.c	Sun Nov 21 19:46:37 2010 +0000
+++ b/libass/ass_drawing.c	Tue Nov 23 14:44:26 2010 +0000
@@ -367,7 +367,7 @@
     drawing->fontconfig_priv = fontconfig_priv;
     drawing->font = font;
     drawing->ftlibrary = lib;
-    drawing->library = font->library;
+    drawing->library = font ? font->library : NULL;
 
     drawing->scale_x = 1.;
     drawing->scale_y = 1.;