Remove memleak in input_ItemAddInfo (check correctly vasprintf return value).

[vlc] / src / input / item.c

diff --git a/src/input/item.c b/src/input/item.c
index 1432a56c81c2a1a51d683be137c1f7ba947f4c65..27f7a09db80f598b9918a083d7bb8f5ae9728cda 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -26,7 +26,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_interface.h"
 
@@ -62,6 +62,10 @@ static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
         vlc_InputItemDurationChanged );
     vlc_event_manager_register_event_type( &p_i->event_manager,
         vlc_InputItemPreparsedChanged );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemNameChanged );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemInfoChanged );
 }
 
 static inline void input_ItemClean( input_item_t *p_i )
@@ -189,13 +193,13 @@ static void input_ItemDestroy ( gc_object_t *p_this )
 
     input_ItemClean( p_input );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i);
     if( i != -1 )
         ARRAY_REMOVE( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     free( p_input );
 }
@@ -291,7 +295,7 @@ int input_ItemAddInfo( input_item_t *p_i,
     }
 
     va_start( args, psz_format );
-    if( vasprintf( &p_info->psz_value, psz_format, args) )
+    if( vasprintf( &p_info->psz_value, psz_format, args) == -1 )
         p_info->psz_value = NULL;
     va_end( args );
 
@@ -306,13 +310,13 @@ input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id )
     input_item_t * p_ret = NULL;
     int i;
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
     if( i != -1 )
         p_ret = ARRAY_VAL( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     return p_ret;
 }
@@ -341,12 +345,12 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
     DECMALLOC_NULL( p_input, input_item_t );
 
     input_ItemInit( p_obj, p_input );
-    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
+    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
     p_input->i_id = ++priv->i_last_input_id;
     ARRAY_APPEND( priv->input_items, p_input );
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     p_input->b_fixed_name = false;