Commit 0a3d05b4 authored by Lukáš Lalinský's avatar Lukáš Lalinský Committed by Rémi Denis-Courmont

taglib: fix NULL deferences after dynamic cast

Reported-by: FortiGuard Lab
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 1b67e3a6
...@@ -132,6 +132,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* ...@@ -132,6 +132,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
{ {
ID3v2::UniqueFileIdentifierFrame* p_ufid = ID3v2::UniqueFileIdentifierFrame* p_ufid =
dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter); dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
if( !p_ufid )
continue;
const char *owner = p_ufid->owner().toCString(); const char *owner = p_ufid->owner().toCString();
if (!strcmp( owner, "http://musicbrainz.org" )) if (!strcmp( owner, "http://musicbrainz.org" ))
{ {
...@@ -152,6 +154,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* ...@@ -152,6 +154,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
{ {
ID3v2::UserTextIdentificationFrame* p_txxx = ID3v2::UserTextIdentificationFrame* p_txxx =
dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter); dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
if( !p_txxx )
continue;
vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ), vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
p_txxx->fieldList().toString().toCString( true ) ); p_txxx->fieldList().toString().toCString( true ) );
} }
...@@ -208,6 +212,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* ...@@ -208,6 +212,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
{ {
ID3v2::AttachedPictureFrame* p_apic = ID3v2::AttachedPictureFrame* p_apic =
dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter); dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
if( !p_apic )
continue;
input_attachment_t *p_attachment; input_attachment_t *p_attachment;
const char *psz_mime; const char *psz_mime;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment