taglib: fix potential null dereference.

e7bfbd1d · Rémi Duraffort · 40f657d5 · e7bfbd1d
Commit e7bfbd1d authored Aug 29, 2012 by Rémi Duraffort
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

modules/meta_engine/taglib.cpp modules/meta_engine/taglib.cpp +8 -4

No files found.
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -385,10 +385,14 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
        p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
                                psz_description, p_data, i_data );
-        if( p_attachment )
+        if( !p_attachment )
-            TAB_APPEND_CAST( (input_attachment_t**),
+        {
-                             p_demux_meta->i_attachments, p_demux_meta->attachments,
+            free( psz_description );
-                             p_attachment );
+            continue;
+        }
+        TAB_APPEND_CAST( (input_attachment_t**),
+                         p_demux_meta->i_attachments, p_demux_meta->attachments,
+                         p_attachment );
        free( psz_description );
        unsigned i_pic_type = p_apic->type();