vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jul 26 18:06:50 2015 +0300| [adcff8d401c223d0442c28d3246546e7cdef2630] | committer: Rémi Denis-Courmont
input: fix NULL dereference with --demux "" > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=adcff8d401c223d0442c28d3246546e7cdef2630 --- src/input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/input.c b/src/input/input.c index 99d8e61..1ba589c 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -2170,7 +2170,7 @@ static int InputSourceInit( input_thread_t *p_input, /* special hack for forcing a demuxer with --demux=module * (and do nothing with a list) */ psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); - psz_demux = psz_var_demux; + psz_demux = (psz_var_demux != NULL) ? psz_var_demux : "any"; msg_Dbg( p_input, "specified demux `%s'", psz_demux ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
