[vlc-commits] demux: fix potential crash if the renderer has no demux filter

Steve Lhomme git at videolan.org
Fri Jun 29 17:36:13 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jun 29 09:38:50 2018 +0200| [129b682c368e055935657f2724630c8699315bf2] | committer: Steve Lhomme

demux: fix potential crash if the renderer has no demux filter

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

 src/input/demux.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index f13eda7b5d..bb87fa39c2 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -538,8 +538,9 @@ static bool demux_filter_enable_disable(demux_t *p_demux,
 {
     struct vlc_demux_private *priv = vlc_stream_Private(p_demux);
 
-    if (strcmp(module_get_name(priv->module, false), psz_demux) == 0
-     || strcmp(module_get_name(priv->module, true), psz_demux) == 0)
+    if ( psz_demux &&
+        (strcmp(module_get_name(priv->module, false), psz_demux) == 0
+      || strcmp(module_get_name(priv->module, true), psz_demux) == 0) )
     {
         demux_Control( p_demux,
                        b_enable ? DEMUX_FILTER_ENABLE : DEMUX_FILTER_DISABLE );



More information about the vlc-commits mailing list