Input access locking. Part one

[vlc] / src / control / media_descriptor.c

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 02f58ace97fc45365b1e9d9c7af8057417f0b6d6..95bc72c6ea5468339374d747a7cd798af0d05d81 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -276,7 +276,7 @@ char * libvlc_media_descriptor_get_meta( libvlc_media_descriptor_t *p_md,
                                          libvlc_meta_t e_meta,
                                          libvlc_exception_t *p_e )
 {
-    const char * psz_meta;
+    char * psz_meta;
 
     /* XXX: locking */
 
@@ -287,11 +287,17 @@ char * libvlc_media_descriptor_get_meta( libvlc_media_descriptor_t *p_md,
 
     /* Should be integrated in core */
     if( !psz_meta && e_meta == libvlc_meta_Title && p_md->p_input_item->psz_name )
+    {
+        free( psz_meta );
         return strdup( p_md->p_input_item->psz_name );
+    }
 
     if( !psz_meta )
-        return NULL;
+    {
+        free( psz_meta );
+        return NULL
+    }
 
-    return strdup( psz_meta );
+    return psz_meta;
 }