highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfdec: Check for avio_read() failure in mxf_read_strong_ref_array()

Browse Source 
Fixes: 42827/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-4900528511909888

Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8d6f49cfc339825f3f3f8a910e4bb4c0f822db1f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-03-13 00:36:55 +01:00
parent 2a549b2e7d
commit 2ad47d59af
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfdec.c
View File

@ -875,6 +875,7 @@ static int mxf_read_cryptographic_context(void *arg, AVIOContext *pb, int tag, i
static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count) static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count)
{ {
int64_t ret;
unsigned c = avio_rb32(pb); unsigned c = avio_rb32(pb);
//avio_read() used int //avio_read() used int
@ -889,7 +890,12 @@ static int mxf_read_strong_ref_array(AVIOContext *pb, UID **refs, int *count)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */ avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */
avio_read(pb, (uint8_t *)*refs, *count * sizeof(UID)); ret = avio_read(pb, (uint8_t *)*refs, *count * sizeof(UID));
if (ret != *count * sizeof(UID)) {
*count = ret < 0 ? 0 : ret / sizeof(UID);
return ret < 0 ? ret : AVERROR_INVALIDDATA;
}
return 0; return 0;
} }