vlc/vlc-1.1 | branch: master | Lukáš Lalinský <[email protected]> | Wed Aug 11 22:02:30 2010 +0300| [24918843e57c7962e28fcb01845adce82bed6516] | committer: Rémi Denis-Courmont
taglib: fix NULL deferences after dynamic cast Reported-by: FortiGuard Lab Signed-off-by: Rémi Denis-Courmont <[email protected]> (cherry picked from commit 0a3d05b4058fe683e2ef49da8ece9214ade01870) > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=24918843e57c7962e28fcb01845adce82bed6516 --- modules/meta_engine/taglib.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 9ddb26e..e927148 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -131,6 +131,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"; )) { @@ -151,6 +153,8 @@ 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 ) ); } @@ -207,6 +211,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; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
