[vlc-commits] preparser: fix segfault if input_Start fails

Thomas Guillem git at videolan.org
Thu Jul 12 15:52:06 CEST 2018


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jul 12 15:47:16 2018 +0200| [e86e9e59c2dd243fd3780f7791fba57b2ca9d65e] | committer: Thomas Guillem

preparser: fix segfault if input_Start fails

PS: This function is very unlikely to fail (only if vlc_clone fails).

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

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

diff --git a/src/preparser/preparser.c b/src/preparser/preparser.c
index ee9699618c..99c3b85523 100644
--- a/src/preparser/preparser.c
+++ b/src/preparser/preparser.c
@@ -64,8 +64,8 @@ static int PreparserOpenInput( void* preparser_, void* item_, void** out )
     var_AddCallback( input, "intf-event", InputEvent, preparser->worker );
     if( input_Start( input ) )
     {
-        input_Close( input );
         var_DelCallback( input, "intf-event", InputEvent, preparser->worker );
+        input_Close( input );
         input_item_SignalPreparseEnded( item_, ITEM_PREPARSE_FAILED );
         return VLC_EGENERIC;
     }



More information about the vlc-commits mailing list