From: Ilkka Ollakka <ileoo@videolan.org>
Date: Thu, 8 Jul 2010 11:49:49 +0000 (+0300)
Subject: taglib: dont decode psz_file as URI
X-Git-Tag: 1.2.0-pre1~5912
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=167f75fbfdb2f9a00ee2e7f438b4746197890b1f;p=vlc

taglib: dont decode psz_file as URI
---

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 973e42ef0a..4e25b50de9 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -361,20 +361,26 @@ static int ReadMeta( vlc_object_t* p_this)
     if( strcmp( p_demux->psz_access, "file" ) )
         return VLC_EGENERIC;
 
-    char *psz_path = decode_URI_duplicate( p_demux->psz_file );
+    char *psz_path = strdup( p_demux->psz_file );
     if( !psz_path )
         return VLC_ENOMEM;
 
 #if defined(WIN32) || defined (UNDER_CE)
     wchar_t wpath[MAX_PATH + 1];
     if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
+    {
+        free( psz_path );
         return VLC_EGENERIC;
+    }
     wpath[MAX_PATH] = L'\0';
     f = FileRef( wpath );
 #else
     const char* local_name = ToLocale( psz_path );
     if( !local_name )
+    {
+        free( psz_path );
         return VLC_EGENERIC;
+    }
     f = FileRef( local_name );
     LocaleFree( local_name );
 #endif