]> git.sesse.net Git - vlc/commitdiff
taglib: fix album art segfault
authorRafaël Carré <funman@videolan.org>
Sat, 17 Nov 2012 22:18:46 +0000 (23:18 +0100)
committerRafaël Carré <funman@videolan.org>
Sat, 17 Nov 2012 22:19:45 +0000 (23:19 +0100)
Closes #7775

modules/meta_engine/taglib.cpp

index ca16511a41763ef9f523ac47add7077cf09ccdbb..cc2d05d5f513d6a20b0e5ef877e90dd15fe96d7f 100644 (file)
@@ -473,14 +473,16 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
     }
 
     TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
-    TAB_APPEND_CAST( (input_attachment_t**),
-                     p_demux_meta->i_attachments, p_demux_meta->attachments,
-                     p_attachment );
+    if (p_attachment) {
+        TAB_APPEND_CAST( (input_attachment_t**),
+                p_demux_meta->i_attachments, p_demux_meta->attachments,
+                p_attachment );
 
-    char *psz_url;
-    if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) {
-        vlc_meta_SetArtURL( p_meta, psz_url );
-        free( psz_url );
+        char *psz_url;
+        if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) {
+            vlc_meta_SetArtURL( p_meta, psz_url );
+            free( psz_url );
+        }
     }
 }