[vlc-commits] libvlc_media_get_meta: do not free(NULL)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 10 19:09:58 2011 +0300| [068f7eeaaf97af7ac67b36af3bdc528b57b747f1] | committer: Rémi Denis-Courmont

libvlc_media_get_meta: do not free(NULL)

This has no effects, so lets not do it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=068f7eeaaf97af7ac67b36af3bdc528b57b747f1
---

 src/control/media.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/control/media.c b/src/control/media.c
index ce77149..68ac4ed 100644
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -486,11 +486,9 @@ char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta )
     }
 
     /* 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 == NULL && e_meta == libvlc_meta_Title
+     && p_md->p_input_item->psz_name != NULL )
+        psz_meta = strdup( p_md->p_input_item->psz_name );
 
     return psz_meta;
 }