Skip to content

V
vlc-gpu
Commit 8be514bb authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

input.c: fixed segfault with access_demux.

parent 06127932
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/input/input.c
View file @ 8be514bb
...@@ -820,7 +820,8 @@ static int Init( input_thread_t * p_input ) ...@@ -820,7 +820,8 @@ static int Init( input_thread_t * p_input )
vlc_meta_Delete( p_meta_tmp ); vlc_meta_Delete( p_meta_tmp );
} }
if( access2_Control( p_input->input.p_access, ACCESS_GET_META, &p_meta_tmp)) if( !p_input->input.p_access ||
access2_Control( p_input->input.p_access, ACCESS_GET_META, &p_meta_tmp))
p_meta_tmp = NULL; p_meta_tmp = NULL;
if( p_meta == NULL ) if( p_meta == NULL )
...@@ -852,7 +853,8 @@ static int Init( input_thread_t * p_input ) ...@@ -852,7 +853,8 @@ static int Init( input_thread_t * p_input )
} }
} }
if( !access2_Control( p_input->slave[i]->p_access, if( p_input->slave[i]->p_access &&
!access2_Control( p_input->slave[i]->p_access,
ACCESS_GET_META, &p_meta_slave ) ) ACCESS_GET_META, &p_meta_slave ) )
{ {
if( p_meta == NULL ) if( p_meta == NULL )
......
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