From: Rafaël Carré <rafael.carre@gmail.com>
Date: Fri, 9 Jul 2010 17:12:58 +0000 (+0200)
Subject: src/playlist/loadsave.c : Fix [1644d683e9df]
X-Git-Tag: 1.2.0-pre1~5891
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fe3cb633a222d1dde3fc300fe654b66a1c9b070c;p=vlc

src/playlist/loadsave.c : Fix [1644d683e9df]

typo and double free
---

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index ce9f9d13a6..eed2f8e972 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -128,7 +128,7 @@ int playlist_MLLoad( playlist_t *p_playlist )
     }
 
     char *psz_file;
-    if( asprintf( &psz_file, "%s" DIR_SEP "ml.xspf", psz_datadir ) != -1 )
+    if( asprintf( &psz_file, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 )
         psz_file = NULL;
     free( psz_datadir );
     if( psz_file == NULL )
@@ -136,10 +136,11 @@ int playlist_MLLoad( playlist_t *p_playlist )
 
     /* loosy check for media library file */
     struct stat st;
-    int ret = vlc_stat( psz_file, &st );
-    free( psz_file );
-    if( ret )
+    if( vlc_stat( psz_file, &st ) )
+    {
+        free( psz_file );
         return VLC_EGENERIC;
+    }
 
     char *psz_uri = make_URI( psz_file, "file/xspf-open" );
     free( psz_file );