Changeset 1421fa57d972c05149470d7f56e4334629c2c8d4

Timestamp:

12/23/07 15:19:00 (9 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198419540 +0000

git-parent:

[a01893ff324856bc99739e72323eb6616b0b1309]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198419540 +0000

Message:

vlc_common.h:
* Add some proper assert() to the vlc_gc_* function to spot errors.
* Correctly initialize the refcount to 1. (This will prevent freed pointer usage). (This may also introduce leaks in some module).
modules/*.c:
* Prevent some module to leak input_item_t.

Files:

• include/vlc_common.h (modified) (4 diffs)
• modules/misc/lua/vlc.c (modified) (1 diff)
• modules/services_discovery/bonjour.c (modified) (1 diff)
• modules/services_discovery/freebox.c (modified) (1 diff)
• modules/services_discovery/hal.c (modified) (4 diffs)
• modules/services_discovery/sap.c (modified) (1 diff)
• modules/services_discovery/shout.c (modified) (1 diff)

include/vlc_common.h

@@ -64 +64 @@
-#include <stdlib.h>
-#include <stdarg.h>
+#include <assert.h>
-
-#include <string.h>
@@ -611 +612 @@
-static inline void __vlc_gc_incref( gc_object_t * p_gc )
-{
+    assert( p_gc->i_gc_refcount > 0 );
+
-    p_gc->i_gc_refcount ++;
-};
@@ -616 +619 @@
-static inline void __vlc_gc_decref( gc_object_t *p_gc )
-{
+    if( !p_gc ) return;
+
+    assert( p_gc->i_gc_refcount > 0 );
+
-    p_gc->i_gc_refcount -- ;
-
@@ -622 +629 @@
-        p_gc->pf_destructor( p_gc );
-        /* Do not use the p_gc pointer from now on ! */
-
+
+
+
+
+
+
+
+
+
+
-}
-
-#define vlc_gc_incref( a ) __vlc_gc_incref( (gc_object_t *)a )
-#define vlc_gc_decref( a ) __vlc_gc_decref( (gc_object_t *)a )
-
-
-
+
-
-

modules/misc/lua/vlc.c

@@ -754 +754 @@
-                                           PLAYLIST_END, VLC_TRUE, VLC_FALSE );
-                    i_count ++; /* increment counter */
-
+
-                    while( i_options > 0 )
-                        free( ppsz_options[--i_options] );

modules/services_discovery/bonjour.c

@@ -190 +190 @@
-                name, p_input );
-            services_discovery_AddItem( p_sd, p_input, NULL /* no category */ );
+            vlc_gc_decref( p_input );
-       }
-    }

modules/services_discovery/freebox.c

@@ -89 +89 @@
-                                _("Freebox TV"), 0, NULL, -1 );
-    input_ItemAddOption( p_input, "no-playlist-autostart" );
-    vlc_gc_incref( p_input );
-
-    vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, ItemAdded, p_sd );

modules/services_discovery/hal.c

@@ -202 +202 @@
-        return;
-    }
+    vlc_gc_incref( p_input );
-    p_udi_entry->p_item = p_input;
-    p_udi_entry->psz_udi = strdup( psz_device );
@@ -239 +240 @@
-    AddItem( p_sd, p_input );
-#endif
+    vlc_gc_decref( p_input );
-}
-
@@ -252 +254 @@
-        { /* delete the corresponding item */    
-            services_discovery_RemoveItem( p_sd, p_sys->pp_devices[i]->p_item );
+            vlc_gc_decref( p_sys->pp_devices[i]->p_item );
-            if( p_sys->pp_devices[i]->psz_udi )
-                free( p_sys->pp_devices[i]->psz_udi );
@@ -285 +288 @@
-    AddItem( p_sd, p_input );
-#endif
+    vlc_gc_decref( p_input );
-}
-

modules/services_discovery/sap.c

@@ -896 +896 @@
-
-    TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
-
+
-    return p_sap;
-}

modules/services_discovery/shout.c

@@ -140 +140 @@
-            break;
-    }
-    vlc_gc_incref( p_sys->p_input ); /* Refcount to 1, so we can release it
-                                      * in Close() */
-
-    input_ItemAddOption( p_sys->p_input, "no-playlist-autostart" );