Fix lua telnet vlm_message_to_string

[vlc] / modules / misc / lua / demux.c

diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c
index c3d3595c69d2a6bd64243cf6029a8bceda7bf188..3fe1ef72eb755d82d4ad8eef79fc8c0fd982b3d8 100644 (file)
--- a/modules/misc/lua/demux.c
+++ b/modules/misc/lua/demux.c
@@ -142,7 +142,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
     luaopen_stream( L );
     luaopen_xml( L );
     luaopen_md5( L );
-    lua_pushstring( L, p_demux->psz_path );
+    lua_pushstring( L, p_demux->psz_location );
     lua_setfield( L, -2, "path" );
     lua_pushstring( L, p_demux->psz_access );
     lua_setfield( L, -2, "access" );
@@ -169,14 +169,14 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
 
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_demux, "Error while runing script %s, "
+        msg_Warn( p_demux, "Error while running script %s, "
                   "function probe() not found", psz_filename );
         goto error;
     }
 
     if( lua_pcall( L, 0, 1, 0 ) )
     {
-        msg_Warn( p_demux, "Error while runing script %s, "
+        msg_Warn( p_demux, "Error while running script %s, "
                   "function probe(): %s", psz_filename,
                   lua_tostring( L, lua_gettop( L ) ) );
         goto error;
@@ -255,16 +255,18 @@ static int Demux( demux_t *p_demux )
 
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_demux, "Error while runing script %s, "
+        msg_Warn( p_demux, "Error while running script %s, "
                   "function parse() not found", psz_filename );
+        vlc_object_release( p_input_thread );
         return VLC_EGENERIC;
     }
 
     if( lua_pcall( L, 0, 1, 0 ) )
     {
-        msg_Warn( p_demux, "Error while runing script %s, "
+        msg_Warn( p_demux, "Error while running script %s, "
                   "function parse(): %s", psz_filename,
                   lua_tostring( L, lua_gettop( L ) ) );
+        vlc_object_release( p_input_thread );
         return VLC_EGENERIC;
     }