Fix crash during early exit

Starting MPlayer with options such as "-demuxer help" that exit before
initializing OSD struct would crash at exit because of a reference to
mpctx->osd->sub_font in deinitialization code. Fix by checking that
mpctx->osd is not NULL.

Checking that osd->sub_font is not NULL was unnecessary because
free_font_desc(NULL) is safe.

1 files changed, 3 insertions, 3 deletions

diff --git a/mplayer.c b/mplayer.c
index 3c487d3be6..eb50e37ea2 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -670,9 +670,9 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){
 
 #ifdef HAVE_FREETYPE
   current_module="uninit_font";
-  if (mpctx->osd->sub_font && mpctx->osd->sub_font != vo_font) free_font_desc(mpctx->osd->sub_font);
-  mpctx->osd->sub_font = NULL;
-  if (vo_font) free_font_desc(vo_font);
+  if (mpctx->osd && mpctx->osd->sub_font != vo_font)
+      free_font_desc(mpctx->osd->sub_font);
+  free_font_desc(vo_font);
   vo_font = NULL;
   done_freetype();
 #endif