Clone video filter : fix potential memleak.

[vlc] / modules / video_filter / clone.c

diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index f6da2495dde98707740a14d0260d01f39a3d168a..4653563024b22e693a08f8166fb17f9b4855e601 100644 (file)
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -24,10 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "filter_common.h"
@@ -63,20 +66,20 @@ static int  SendEvents( vlc_object_t *, char const *,
 #define CFG_PREFIX "clone-"
 
 vlc_module_begin();
-    set_description( _("Clone video filter") );
+    set_description( N_("Clone video filter") );
     set_capability( "video filter", 0 );
-    set_shortname( _("Clone" ));
+    set_shortname( N_("Clone" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
-    add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
-    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, false );
+    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true );
 
     add_shortcut( "clone" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "count", "vout-list", NULL
 };
 
@@ -124,10 +127,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_vout->pf_init = Init;
     p_vout->pf_end = End;
@@ -160,7 +160,7 @@ static int Create( vlc_object_t *p_this )
                                                 * sizeof(char *) );
         if( !p_vout->p_sys->ppsz_vout_list )
         {
-            msg_Err( p_vout, "out of memory" );
+            free( psz_clonelist );
             free( p_vout->p_sys );
             return VLC_ENOMEM;
         }
@@ -217,9 +217,10 @@ static int Init( vout_thread_t *p_vout )
     int   i_index, i_vout;
     picture_t *p_pic;
     char *psz_default_vout;
-    video_format_t fmt = {0};
+    video_format_t fmt;
 
     I_OUTPUTPICTURES = 0;
+    memset( &fmt, 0, sizeof(video_format_t) );
 
     /* Initialize the output structure */
     p_vout->output.i_chroma = p_vout->render.i_chroma;
@@ -237,7 +238,7 @@ static int Init( vout_thread_t *p_vout )
 
     for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ )
     {
-        if( p_vout->p_sys->ppsz_vout_list == NULL 
+        if( p_vout->p_sys->ppsz_vout_list == NULL
             || ( !strncmp( p_vout->p_sys->ppsz_vout_list[i_vout],
                            "default", 8 ) ) )
         {
@@ -261,7 +262,7 @@ static int Init( vout_thread_t *p_vout )
             msg_Err( p_vout, "failed to clone %i vout threads",
                      p_vout->p_sys->i_clones );
             p_vout->p_sys->i_clones = i_vout;
-            if( psz_default_vout ) free( psz_default_vout );
+            free( psz_default_vout );
             RemoveAllVout( p_vout );
             return VLC_EGENERIC;
         }
@@ -269,7 +270,7 @@ static int Init( vout_thread_t *p_vout )
         ADD_CALLBACKS( p_vout->p_sys->pp_vout[ i_vout ], SendEvents );
     }
 
-    if( psz_default_vout ) free( psz_default_vout );
+    free( psz_default_vout );
     ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
 
     ADD_PARENT_CALLBACKS( SendEventsToChild );
@@ -284,12 +285,16 @@ static void End( vout_thread_t *p_vout )
 {
     int i_index;
 
+    DEL_PARENT_CALLBACKS( SendEventsToChild );
+
     /* Free the fake output buffers we allocated */
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
         free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
+
+    RemoveAllVout( p_vout );
 }
 
 /*****************************************************************************
@@ -301,10 +306,6 @@ static void Destroy( vlc_object_t *p_this )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
 
-    RemoveAllVout( p_vout );
-
-    DEL_PARENT_CALLBACKS( SendEventsToChild );
-
     free( p_vout->p_sys->pp_vout );
     free( p_vout->p_sys );
 }
@@ -327,7 +328,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 )
                ) == NULL )
         {
-            if( p_vout->b_die || p_vout->b_error )
+            if( !vlc_object_alive (p_vout) || p_vout->b_error )
             {
                 vout_DestroyPicture(
                     p_vout->p_sys->pp_vout[ i_vout ], p_outpic );
@@ -354,7 +355,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             if( i_in_pitch == i_copy_pitch
                  && i_out_pitch == i_copy_pitch )
             {
-                p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch
+                vlc_memcpy( p_out, p_in, i_in_pitch
                                      * p_outpic->p[i_plane].i_visible_lines );
             }
             else
@@ -364,7 +365,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 
                 while( p_in < p_in_end )
                 {
-                    p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+                    vlc_memcpy( p_out, p_in, i_copy_pitch );
                     p_in += i_in_pitch;
                     p_out += i_out_pitch;
                 }
@@ -386,8 +387,7 @@ static void RemoveAllVout( vout_thread_t *p_vout )
          --p_vout->p_sys->i_clones;
          DEL_CALLBACKS( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones],
                         SendEvents );
-         vlc_object_detach( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
-         vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
+         vout_CloseAndRelease( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
     }
 }
 
@@ -397,6 +397,7 @@ static void RemoveAllVout( vout_thread_t *p_vout )
 static int SendEvents( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     var_Set( (vlc_object_t *)p_data, psz_var, newval );
 
     return VLC_SUCCESS;
@@ -408,6 +409,7 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var,
 static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     int i_vout;