[vlc-commits] decoder: fix potential NULL dereference

Rémi Denis-Courmont git at videolan.org
Sun Sep 14 16:53:09 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 14 17:53:03 2014 +0300| [7df464879acb66d7a0a19905e3d48b7e6b5fcf33] | committer: Rémi Denis-Courmont

decoder: fix potential NULL dereference

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

 src/input/decoder.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index c90d149..972522a 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2003,7 +2003,8 @@ static int aout_update_format( decoder_t *p_dec )
 
         DecoderUpdateFormatLocked( p_dec );
 
-        if( unlikely(p_owner->b_paused) ) /* fake pause if needed */
+        if( unlikely(p_owner->b_paused) && p_aout != NULL )
+            /* fake pause if needed */
             aout_DecChangePause( p_aout, true, mdate() );
 
         vlc_mutex_unlock( &p_owner->lock );



More information about the vlc-commits mailing list