[vlc-devel] commit: freetype: simplify (Pierre Ynard )

git version control git at videolan.org
Wed Sep 16 12:34:12 CEST 2009


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed Sep 16 12:33:43 2009 +0200| [a9b60a5e5f879327106105ab579b417c161d0dfd] | committer: Pierre Ynard 

freetype: simplify

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

 modules/misc/freetype.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index c5d291d..b00a50c 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -323,11 +323,10 @@ static int Create( vlc_object_t *p_this )
     fontindex=0;
     if( !psz_fontfamily || !*psz_fontfamily )
     {
+        free( psz_fontfamily );
 #ifdef HAVE_FONTCONFIG
-        free( psz_fontfamily);
         psz_fontfamily=strdup( DEFAULT_FONT );
 #else
-        free( psz_fontfamily );
         psz_fontfamily = (char *)malloc( PATH_MAX + 1 );
         if( !psz_fontfamily )
             goto error;




More information about the vlc-devel mailing list