[vlc-commits] es_out: fix null deref regression

Francois Cartegnie git at videolan.org
Thu Apr 16 15:50:49 CEST 2020


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Apr  8 14:52:43 2020 +0200| [cd7a0269c7f4fdb4427685a9fed90ae2c08dd537] | committer: Francois Cartegnie

es_out: fix null deref regression

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

 src/input/es_out.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index d6fa3e41e7..ec563f896e 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2414,7 +2414,7 @@ static void EsOutSelect( es_out_t *out, es_out_id_t *es, bool b_force )
     es_out_sys_t *p_sys = container_of(out, es_out_sys_t, out);
     es_out_es_props_t *p_esprops = GetPropsByCat( p_sys, es->fmt.i_cat );
 
-    if( !p_sys->b_active ||
+    if( !p_esprops || !p_sys->b_active ||
         ( !b_force && es->fmt.i_priority < ES_PRIORITY_SELECTABLE_MIN ) ||
         !es->p_pgrm )
     {



More information about the vlc-commits mailing list