Skip to content

V
vlc-1.1
Commit 0488fc05 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Backported fix for possible segfault with --input.

parent e7a43d2a
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
src/input/input.c
View file @ 0488fc05
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.163 2001/12/07 18:33:08 sam Exp $ * $Id: input.c,v 1.163.2.1 2001/12/10 16:17:42 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -459,24 +459,27 @@ static int InitThread( input_thread_t * p_input ) ...@@ -459,24 +459,27 @@ static int InitThread( input_thread_t * p_input )
} }
else else
#endif #endif
if( ( ( strlen( p_input->p_source ) > 4 ) if( ( ( ( strlen( p_input->p_source ) > 4 )
&& !strncasecmp( p_input->p_source, "dvd:", 4 ) ) && !strncasecmp( p_input->p_source, "dvd:", 4 ) )
|| TestMethod( INPUT_METHOD_VAR, "dvd" ) ) || TestMethod( INPUT_METHOD_VAR, "dvd" ) )
&& f.pf_open != NULL )
{ {
/* DVD - this is THE kludge */ /* DVD - this is THE kludge */
f.pf_open( p_input ); f.pf_open( p_input );
p_input->stream.i_method = INPUT_METHOD_DVD; p_input->stream.i_method = INPUT_METHOD_DVD;
} }
else if( ( ( strlen( p_input->p_source ) > 8 ) else if( ( ( ( strlen( p_input->p_source ) > 8 )
&& !strncasecmp( p_input->p_source, "dvdread:", 8 ) ) && !strncasecmp( p_input->p_source, "dvdread:", 8 ) )
|| TestMethod( INPUT_METHOD_VAR, "dvdread" ) ) || TestMethod( INPUT_METHOD_VAR, "dvdread" ) )
&& f.pf_open != NULL )
{ {
/* DVDRead - this is THE kludge */ /* DVDRead - this is THE kludge */
f.pf_open( p_input ); f.pf_open( p_input );
p_input->stream.i_method = INPUT_METHOD_DVD; p_input->stream.i_method = INPUT_METHOD_DVD;
} }
else if( ( strlen( p_input->p_source ) > 4 ) else if( ( strlen( p_input->p_source ) > 4 )
&& !strncasecmp( p_input->p_source, "vlc:", 4 ) ) && !strncasecmp( p_input->p_source, "vlc:", 4 )
&& f.pf_open != NULL )
{ {
/* Dummy input - very kludgy */ /* Dummy input - very kludgy */
f.pf_open( p_input ); f.pf_open( p_input );
......
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