[vlc-commits] heif: avoid crashing on AVIF files

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Fri Dec 14 16:42:58 2018 -0500| [bd50c9af95a019f9341f5ce4b65f052115e8734c] | committer: Tristan Matthews

heif: avoid crashing on AVIF files

Samples here: http://download.opencontent.netflix.com/?prefix=AV1/Chimera/AVIF/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd50c9af95a019f9341f5ce4b65f052115e8734c
---

 modules/demux/mp4/heif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/heif.c b/modules/demux/mp4/heif.c
index e923bb3357..d595ca9865 100644
--- a/modules/demux/mp4/heif.c
+++ b/modules/demux/mp4/heif.c
@@ -344,7 +344,7 @@ static int SetPictureProperties( demux_t *p_demux, uint32_t i_item_id,
                 case ATOM_hvcC:
                 case ATOM_avcC:
                 case ATOM_av1C:
-                    if( !fmt->p_extra &&
+                    if( !fmt->p_extra && p_prop->data.p_binary &&
                        ((fmt->i_codec == VLC_CODEC_HEVC && p_prop->i_type == ATOM_hvcC) ||
                         (fmt->i_codec == VLC_CODEC_H264 && p_prop->i_type == ATOM_avcC) ||
                         (fmt->i_codec == VLC_CODEC_AV1  && p_prop->i_type == ATOM_av1C)) )