From 9d65e77152039fcb91ff55e8a590bafc17f642c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sat, 12 Jul 2008 13:20:23 +0200 Subject: [PATCH 1/1] Avoid potential segfault and fix potential memleak. --- src/input/demux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/input/demux.c b/src/input/demux.c index be8f48e869..9aa2105cf7 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -54,7 +54,7 @@ demux_t *__demux_New( vlc_object_t *p_obj, p_demux->psz_path = strdup( psz_path ); /* Take into account "demux" to be able to do :demux=dump */ - if( *p_demux->psz_demux == '\0' ) + if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) { free( p_demux->psz_demux ); p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" ); @@ -358,6 +358,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux, VLC_THREAD_PRIORITY_INPUT, false ) ) { vlc_object_release( s ); + free( p_sys->psz_name ); free( p_sys ); return NULL; } -- 2.39.2