[vlc-devel] [PATCH v2] demux: ts: fix null dereference in close callback

[Francois Cartegnie]

Le 23/08/2020 à 04:33, Akinobu Mita a écrit :

> diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
> index dbdec34529..74ffb8b8fb 100644
> --- a/modules/demux/mpeg/ts_psi.c
> +++ b/modules/demux/mpeg/ts_psi.c
> @@ -2074,6 +2074,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
>                  {
>                      p_sys->arib.b25stream = vlc_stream_FilterNew( p_demux->s, "aribcam" );
>                      p_sys->stream = ( p_sys->arib.b25stream ) ? p_sys->arib.b25stream : p_demux->s;
> +                    p_demux->s = p_sys->stream;
>                  }

Sorry, but you can't overwrite the original stream pointer on demux.

I'll probably have a better fix.

-- 
Francois Cartegnie
VideoLAN - VLC Developer