Commit 353a8120 authored by ivoire's avatar ivoire
Browse files

Fix memleak when using --demux.

parent 9c03ddbb
...@@ -2335,6 +2335,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2335,6 +2335,7 @@ static int InputSourceInit( input_thread_t *p_input,
const char *psz_access; const char *psz_access;
const char *psz_demux; const char *psz_demux;
char *psz_path; char *psz_path;
char *psz_var_demux = NULL;
double f_fps; double f_fps;
char *psz_dup = strdup( psz_mrl ); char *psz_dup = strdup( psz_mrl );
...@@ -2402,7 +2403,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2402,7 +2403,7 @@ static int InputSourceInit( input_thread_t *p_input,
{ {
/* special hack for forcing a demuxer with --demux=module /* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */ * (and do nothing with a list) */
char *psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); psz_var_demux = var_GetNonEmptyString( p_input, "demux" );
if( psz_var_demux != NULL && if( psz_var_demux != NULL &&
!strchr(psz_var_demux, ',' ) && !strchr(psz_var_demux, ',' ) &&
...@@ -2643,6 +2644,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2643,6 +2644,7 @@ static int InputSourceInit( input_thread_t *p_input,
} }
} }
free( psz_var_demux );
free( psz_dup ); free( psz_dup );
/* Set record capabilities */ /* Set record capabilities */
...@@ -2692,6 +2694,8 @@ error: ...@@ -2692,6 +2694,8 @@ error:
if( in->p_access ) if( in->p_access )
access_Delete( in->p_access ); access_Delete( in->p_access );
free( psz_var_demux );
free( psz_dup ); free( psz_dup );
return VLC_EGENERIC; return VLC_EGENERIC;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment