Changeset 4f86b958a07865f443eef419a6e609f75568492a

Timestamp:

01/15/06 23:10:41 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1137363041 +0000

git-parent:

[348c8741c3f99e9492f69db912e70599e55e116b]

git-author:

Clément Stenac <zorglub@videolan.org> 1137363041 +0000

Message:

Fix some memleaks

Files:

• include/vlc_messages.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (4 diffs)
• src/libvlc.c (modified) (1 diff)
• src/misc/stats.c (modified) (1 diff)
• src/misc/vlm.c (modified) (2 diffs)

include/vlc_messages.h

@@ -244 +244 @@
-};
-
+VLC_EXPORT( void, stats_HandlerDestroy, (stats_handler_t*) );
+
-#define stats_Update( a,b,c) __stats_Update( VLC_OBJECT( a ), b, c )
-VLC_EXPORT( int, __stats_Update, (vlc_object_t*, char *, vlc_value_t) );

include/vlc_symbols.h

@@ -329 +329 @@
-int playlist_Add (playlist_t *, const char *, const char *, int, int);
-char * sout_CfgCreate (char **, sout_cfg_t **, char *);
+void stats_HandlerDestroy (stats_handler_t*);
-osd_menu_t * __osd_MenuCreate (vlc_object_t *, const char *);
-void * vlc_opendir (const char *);
@@ -886 +887 @@
-    counter_t* (*__stats_CounterGet_inner) (vlc_object_t*, int, char *);
-    input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
+    void (*stats_HandlerDestroy_inner) (stats_handler_t*);
-};
-#  if defined (__PLUGIN__)
@@ -1314 +1316 @@
-#  define __stats_CounterGet (p_symbols)->__stats_CounterGet_inner
-#  define __input_CreateThread2 (p_symbols)->__input_CreateThread2_inner
+#  define stats_HandlerDestroy (p_symbols)->stats_HandlerDestroy_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1745 +1748 @@
-    ((p_symbols)->__stats_CounterGet_inner) = __stats_CounterGet; \
-    ((p_symbols)->__input_CreateThread2_inner) = __input_CreateThread2; \
+    ((p_symbols)->stats_HandlerDestroy_inner) = stats_HandlerDestroy; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-

src/libvlc.c

@@ -962 +962 @@
-    while( ( p_stats = vlc_object_find( p_vlc, VLC_OBJECT_STATS, FIND_CHILD) ))
-    {
+        stats_HandlerDestroy( p_stats );
-        vlc_object_detach( (vlc_object_t*) p_stats );
-        vlc_object_release( (vlc_object_t *)p_stats );

src/misc/stats.c

@@ -46 +46 @@
-
-/**
+ * Cleanup statistics handler stuff
+ * \param p_stats the handler to clean
+ * \return nothing
+ */
+void stats_HandlerDestroy( stats_handler_t *p_stats )
+{
+    int i;
+    for ( i =  p_stats->i_counters - 1 ; i >= 0 ; i-- )
+    {
+        int j;
+        counter * p_counter = p_stats->pp_counters[i];
+
+        for( j = p_counter->i_samples -1; j >= 0 ; j-- )
+        {
+            counter_sample_t *p_sample = p_counter->pp_samples[j];
+            if( p_sample->val.psz_string )
+                free( p_sample->val.psz_string );
+            REMOVE_ELEM( p_counter->pp_samples, p_counter->i_samples, j );
+            free( p_sample );
+        }
+        free( p_counter->psz_name );
+        REMOVE_ELEM( p_stats->pp_counters, p_stats->i_counter, i );
+        free( p_counter );
+    }
+}
+
+/**
- * Create a statistics counter
- * \param p_this the object for which to create the counter

src/misc/vlm.c

@@ -1107 +1107 @@
-            }
-            free( psz_output );
+            free( psz_header );
-
-            if( media->psz_mux )
@@ -1209 +1210 @@
-            if( p_instance->psz_name ) free( p_instance->psz_name );
-        }
+        free( psz_header );
-
-        return VLC_SUCCESS;