har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfdec: Check container_ul->desc before use

Browse Source 
Fixes: CID1592939 Dereference after null check

Sponsored-by: Sovereign Tech Fund
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4cab028bd0e381f2ed4ccb7f139407f1f6f537c0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-06-07 02:32:13 +02:00
parent 13067aa562
commit 40cca1cf87
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mxfdec.c
View File

@ -3030,6 +3030,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
if (container_ul->desc) if (container_ul->desc)
av_dict_set(&st->metadata, "data_type", container_ul->desc, 0); av_dict_set(&st->metadata, "data_type", container_ul->desc, 0);
if (mxf->eia608_extract && if (mxf->eia608_extract &&
container_ul->desc &&
!strcmp(container_ul->desc, "vbi_vanc_smpte_436M")) { !strcmp(container_ul->desc, "vbi_vanc_smpte_436M")) {
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codecpar->codec_id = AV_CODEC_ID_EIA_608; st->codecpar->codec_id = AV_CODEC_ID_EIA_608;