[MPlayer-cvslog] r38225 - trunk/mplayer.c

reimar subversion at mplayerhq.hu
Wed Jan 20 20:03:35 EET 2021


Author: reimar
Date: Wed Jan 20 20:03:35 2021
New Revision: 38225

Log:
mplayer.c: fix crashes for reinit_video_chain failures.

The error path should undo the reset, it should not
set things that the demuxer owns to NULL.
In particular, the rawdv demuxer would crash if
opening the vo failed.
Fixes trac issue #2326.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Jan 20 20:03:34 2021	(r38224)
+++ trunk/mplayer.c	Wed Jan 20 20:03:35 2021	(r38225)
@@ -2434,7 +2434,7 @@ int reinit_video_chain(void)
     return 1;
 
 err_out:
-    mpctx->sh_video = mpctx->d_video->sh = NULL;
+    mpctx->sh_video = mpctx->sh_video->ds = NULL;
     return 0;
 }
 


More information about the MPlayer-cvslog mailing list