[vlc-commits] decoder: fix potential NULL dereference

[Rémi Denis-Courmont]

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

decoder: fix potential NULL dereference

(cherry picked from commit 7df464879acb66d7a0a19905e3d48b7e6b5fcf33)

Conflicts:
	src/input/decoder.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=60b89fc38444b3409906f0204f7610158210fa6b
---

 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 289b5fd..b956551 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2017,7 +2017,8 @@ static int aout_update_format( decoder_t *p_dec )
 
         p_owner->p_aout = p_aout;
         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 );