Contribs: update live555 patch

[vlc] / modules / meta_engine / taglib.cpp

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 973e42ef0a19d8b3011f84bbd2712c6c5a89500e..e1e03fbef29a6112bb7ac9b4c14e9491011c4a48 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -94,7 +94,7 @@ using namespace TagLib;
 
 
 /**
- * Read meta informations from APE tags
+ * Read meta information from APE tags
  * @param tag: the APE tag
  * @param p_demux; the demux object
  * @param p_demux_meta: the demuxer meta
@@ -132,6 +132,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
     {
         ID3v2::UniqueFileIdentifierFrame* p_ufid =
                 dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
+        if( !p_ufid )
+            continue;
         const char *owner = p_ufid->owner().toCString();
         if (!strcmp( owner, "http://musicbrainz.org" ))
         {
@@ -152,11 +154,13 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
     {
         ID3v2::UserTextIdentificationFrame* p_txxx =
                 dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
+        if( !p_txxx )
+            continue;
         vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
                            p_txxx->fieldList().toString().toCString( true ) );
     }
 
-    // Get some more informations
+    // Get some more information
 #define SET( tagName, metaName )                                               \
     list = tag->frameListMap()[tagName];                                       \
     if( !list.isEmpty() )                                                      \
@@ -208,6 +212,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
     {
         ID3v2::AttachedPictureFrame* p_apic =
             dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
+        if( !p_apic )
+            continue;
         input_attachment_t *p_attachment;
 
         const char *psz_mime;
@@ -271,7 +277,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
 
 
 /**
- * Read the meta informations from XiphComments
+ * Read the meta information from XiphComments
  * @param tag: the Xiph Comment
  * @param p_demux; the demux object
  * @param p_demux_meta: the demuxer meta
@@ -322,7 +328,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met
     vlc_meta_SetArtURL( p_meta, "attachment://cover" );
 }
 
-#ifdef TAGLIB_WITH_MP4
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
 static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
 {
     if( tag->itemListMap().contains("covr") )
@@ -361,20 +367,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
@@ -424,7 +436,7 @@ static int ReadMeta( vlc_object_t* p_this)
         else if( flac->xiphComment() )
             ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
     }
-#ifdef TAGLIB_WITH_MP4
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
     else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
     {
         if( mp4->tag() )
@@ -478,7 +490,7 @@ static int ReadMeta( vlc_object_t* p_this)
 
 
 /**
- * Write meta informations to APE tags
+ * Write meta information to APE tags
  * @param tag: the APE tag
  * @param p_item: the input item
  */
@@ -536,7 +548,7 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item )
 
 
 /**
- * Write the meta informations to XiphComments
+ * Write the meta information to XiphComments
  * @param tag: the Xiph Comment
  * @param p_input: the input item
  */