]> git.sesse.net Git - vlc/commitdiff
* src/input/input.c: fixed segfault with sub autodetection.
authorGildas Bazin <gbazin@videolan.org>
Wed, 19 Oct 2005 09:12:12 +0000 (09:12 +0000)
committerGildas Bazin <gbazin@videolan.org>
Wed, 19 Oct 2005 09:12:12 +0000 (09:12 +0000)
src/input/input.c

index 6221fb8bbd52588aa11c6f00bfd91586e47b3284..1c3001d098b7196af702151811765c0a0d05486d 100644 (file)
@@ -804,7 +804,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
                                             p_input->input.p_item->psz_uri );
             input_source_t *sub;
 
-            for( i = 0; subs[i] != NULL; i++ )
+            for( i = 0; subs && subs[i]; i++ )
             {
                 if( strcmp( psz_subtitle, subs[i] ) )
                 {
@@ -817,8 +817,8 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
                 }
                 free( subs[i] );
             }
-            free( subs );
-            free( psz_autopath );
+            if( subs ) free( subs );
+            if( psz_autopath ) free( psz_autopath );
         }
         free( psz_subtitle );