Fix lua intf thread cancellation and cleanup properly in vlc.net.poll().

[vlc] / modules / misc / lua / libs / net.c

diff --git a/modules/misc/lua/libs/net.c b/modules/misc/lua/libs/net.c
index eb56a958426f72bfff7352d899361d7302575c86..68b875f7f7a4af2607501a9192d24da15a8ced2d 100644 (file)
--- a/modules/misc/lua/libs/net.c
+++ b/modules/misc/lua/libs/net.c
@@ -194,6 +194,7 @@ static int vlclua_net_poll( lua_State *L )
         lua_pop( L, 1 );
     }
     struct pollfd *p_fds = malloc( i_fds * sizeof( struct pollfd ) );
+    vlc_cleanup_push( free, p_fds );
     lua_pushnil( L );
     int i = 0;
     while( lua_next( L, 1 ) )
@@ -212,8 +213,8 @@ static int vlclua_net_poll( lua_State *L )
         lua_pushinteger( L, p_fds[i].revents );
         lua_settable( L, 1 );
     }
-    free( p_fds );
     lua_pushinteger( L, i_ret );
+    vlc_cleanup_run();
     return 1;
 }