[vlc-commits] live555: avoid NULL dereference if codec undefined

Tristan Matthews git at videolan.org
Sun Jan 4 00:47:37 CET 2015


vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Tue Dec 30 23:39:57 2014 -0500| [b1afb643f2e37acdf0452349ad934e5ef7a5e278] | committer: Jean-Baptiste Kempf

live555: avoid NULL dereference if codec undefined

Refs #11938

(cherry picked from commit d1282d53331f4f1982ed070b6a5fd14879349bfc)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/access/live555.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 163ae2d..e8ba5a2 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1292,7 +1292,7 @@ static int Demux( demux_t *p_demux )
         {
             bool b;
             es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
-            if( !b && tk->b_selected )
+            if( !b && tk->b_selected && p_sys->rtsp )
             {
                 tk->b_selected = false;
                 p_sys->rtsp->sendTeardownCommand( *tk->sub, NULL );



More information about the vlc-commits mailing list