[vlc-commits] input: fix use after free

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <le.businessman at gmail.com> | Fri Aug  1 11:55:11 2014 -0400| [acd2b4efb51f5358feb980e86155eecc58027fc7] | committer: Jean-Baptiste Kempf

input: fix use after free

(cherry picked from commit e345ccc4ed2ed312793ff00efdd2bc572d845461)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=acd2b4efb51f5358feb980e86155eecc58027fc7
---

 src/input/input.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 7e71d4e..917eec4 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2415,7 +2415,6 @@ static int InputSourceInit( input_thread_t *p_input,
 
         if( in->p_demux == NULL )
         {
-            stream_Delete( p_stream );
             if( vlc_object_alive( p_input ) )
             {
                 msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
@@ -2426,6 +2425,7 @@ static int InputSourceInit( input_thread_t *p_input,
                                   _("The format of '%s' cannot be detected. "
                                     "Have a look at the log for details."), psz_mrl );
             }
+            stream_Delete( p_stream );
             goto error;
         }
         assert( in->p_demux->pf_demux != NULL );