]> git.sesse.net Git - vlc/commitdiff
taglib: use decoded path
authorIlkka Ollakka <ileoo@videolan.org>
Tue, 11 May 2010 14:52:54 +0000 (17:52 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Tue, 11 May 2010 14:52:54 +0000 (17:52 +0300)
modules/meta_engine/taglib.cpp

index 521197fbc551ca8ed263542f6db329621e029ef7..7beab4476d4a75da6272cd48a3cdcbbd7f2de4a7 100644 (file)
@@ -330,23 +330,27 @@ static int ReadMeta( vlc_object_t* p_this)
     demux_t*        p_demux = p_demux_meta->p_demux;
     vlc_meta_t*     p_meta;
     FileRef f;
+    char *psz_path = decode_URI_duplicate( p_demux->psz_path );
 
     p_demux_meta->p_meta = NULL;
+    if( !psz_path )
+        return VLC_ENOMEM;
 
 
 #if defined(WIN32) || defined (UNDER_CE)
     wchar_t wpath[MAX_PATH + 1];
-    if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) )
+    if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
         return VLC_EGENERIC;
     wpath[MAX_PATH] = L'\0';
     f = FileRef( wpath );
 #else
-    const char* local_name = ToLocale( p_demux->psz_path );
+    const char* local_name = ToLocale( psz_path );
     if( !local_name )
         return VLC_EGENERIC;
     f = FileRef( local_name );
     LocaleFree( local_name );
 #endif
+    free( psz_path );
 
     if( f.isNull() )
         return VLC_EGENERIC;