From: Rémi Denis-Courmont <rem@videolan.org>
Date: Thu, 5 Apr 2007 15:43:28 +0000 (+0000)
Subject: Fix expansion-unsafe macro
X-Git-Tag: 0.9.0-test0~7828
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f46a9806fe5995dd963920ab4ecdbf2c48e6d401;p=vlc

Fix expansion-unsafe macro
---

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 7d3d97db39..e33e1708c5 100644
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -86,8 +86,9 @@ struct vlc_meta_t
 };
 
 #define vlc_meta_Set( meta,var,val ) do { \
+    const char *str = val; \
     if( meta->psz_##var ) free( meta->psz_##var ); \
-    meta->psz_##var = (val) ? strdup( val ) : NULL; } while(0)
+    meta->psz_##var = str ? strdup( str ) : NULL; } while(0)
 
 #define vlc_meta_SetTitle( meta, b ) vlc_meta_Set( meta, title, b );
 #define vlc_meta_SetArtist( meta, b ) vlc_meta_Set( meta, artist, b );