Mercurial > mplayer.hg

changeset 27382:aff29422c652

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes unsafe 'chapter' command with get_property() call. Without it, MPlayer segv trying to dereference NULL demuxer. Patch by Mathieu Schroeter (mathieu dot schroeter at gamesover dot ch)
author ben
date Mon, 04 Aug 2008 13:35:14 +0000
parents 03f861e679a8
children cc16875b72dd
files command.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/command.c	Mon Aug 04 13:34:10 2008 +0000
+++ b/command.c	Mon Aug 04 13:35:14 2008 +0000
@@ -379,12 +379,13 @@
 static int mp_property_chapter(m_option_t *prop, int action, void *arg,
                                MPContext *mpctx)
 {
-    int chapter;
+    int chapter = -1;
     float next_pts = 0;
     int chapter_num;
     int step_all;
     char *chapter_name = NULL;
 
+    if (mpctx->demuxer)
     chapter = demuxer_get_current_chapter(mpctx->demuxer);
     if (chapter < 0)
         return M_PROPERTY_UNAVAILABLE;